[Cmake-commits] CMake branch, next, updated. v2.8.1-1251-gb69977f

[cmake-commits at cmake.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  b69977f2576a3dca957ccfade0b7e6475a079b0b (commit)
       via  c943ccdbfaa4ed04baab6d1237c6e6219e0fe58a (commit)
      from  09e6b6d06ec19e7fda561160d4f6ca20602124df (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b69977f2576a3dca957ccfade0b7e6475a079b0b
commit b69977f2576a3dca957ccfade0b7e6475a079b0b
Merge: 09e6b6d c943ccd
Author: David Cole <david.cole at kitware.com>
Date:   Fri May 28 10:18:54 2010 -0400

    Merge branch 'add-git-to-CheckSourceTreeTest' into next


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c943ccdbfaa4ed04baab6d1237c6e6219e0fe58a
commit c943ccdbfaa4ed04baab6d1237c6e6219e0fe58a
Author: David Cole <david.cole at kitware.com>
Date:   Fri May 28 10:16:44 2010 -0400

    Allow return value of 1 from git status.

diff --git a/Tests/CMakeTests/CheckSourceTreeTest.cmake.in b/Tests/CMakeTests/CheckSourceTreeTest.cmake.in
index 1e99b99..39289f0 100644
--- a/Tests/CMakeTests/CheckSourceTreeTest.cmake.in
+++ b/Tests/CMakeTests/CheckSourceTreeTest.cmake.in
@@ -184,9 +184,9 @@ if(cmd)
   message("")
 
   if(NOT rv STREQUAL 0)
-    if(is_git_checkout AND (rv STREQUAL "1") AND ("${version_output}" STREQUAL "git version 1.5.5"))
-      # git 1.5.5 returns "1" from a "nothing is changed" git status call...
-      # (perhaps broader logic is required here... we'll see on tomorrow's dashboard...)
+    if(is_git_checkout AND (rv STREQUAL "1"))
+      # Many builds of git return "1" from a "nothing is changed" git status call...
+      # Do not fail with an error for rv==1 with git...
     else()
       message(FATAL_ERROR "error: ${cmd} attempt failed... (see output above)")
     endif()

-----------------------------------------------------------------------

Summary of changes:
 Tests/CMakeTests/CheckSourceTreeTest.cmake.in |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake