diff options
| author | David Cole <david.cole@kitware.com> | 2010-05-28 14:16:44 (GMT) |
|---|---|---|
| committer | David Cole <david.cole@kitware.com> | 2010-05-28 14:16:44 (GMT) |
| commit | c943ccdbfaa4ed04baab6d1237c6e6219e0fe58a (patch) | |
| tree | 09a1be6298ac3bf1c6219ca9e2025d323c7e5530 | |
| parent | 806eaa290ca4fa6a5aa623068974118c889a7c12 (diff) | |
| download | CMake-c943ccdbfaa4ed04baab6d1237c6e6219e0fe58a.zip CMake-c943ccdbfaa4ed04baab6d1237c6e6219e0fe58a.tar.gz CMake-c943ccdbfaa4ed04baab6d1237c6e6219e0fe58a.tar.bz2 | |
Allow return value of 1 from git status.
| -rw-r--r-- | Tests/CMakeTests/CheckSourceTreeTest.cmake.in | 6 |
1 files changed, 3 insertions, 3 deletions
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() |