Allow return value of 1 from git status.

This commit is contained in:
David Cole 2010-05-28 10:16:44 -04:00
parent 806eaa290c
commit c943ccdbfa
1 changed files with 3 additions and 3 deletions

View File

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