From c943ccdbfaa4ed04baab6d1237c6e6219e0fe58a Mon Sep 17 00:00:00 2001 From: David Cole Date: Fri, 28 May 2010 10:16:44 -0400 Subject: [PATCH] Allow return value of 1 from git status. --- Tests/CMakeTests/CheckSourceTreeTest.cmake.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Tests/CMakeTests/CheckSourceTreeTest.cmake.in b/Tests/CMakeTests/CheckSourceTreeTest.cmake.in index 1e99b9935..39289f0a1 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()