Merge pull request #835 from remram44/git-update

Makes git_update.sh handle detached heads
CDAT · Oct 22, 2014 · 7f6b49d · 7f6b49d
2 parents 593e5af + f31df7a
commit 7f6b49d
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/CMake/cdat_modules_extra/git_update.sh.in b/CMake/cdat_modules_extra/git_update.sh.in
@@ -2,7 +2,7 @@
 cd @SOURCE_DIR@
 git fetch origin --prune
 branch_name=$(git symbolic-ref HEAD | sed -e 's,.*\/\(.*\),\1,')
-if [ "${branch_name}" != "@BRANCH@" ]; then
+if [ $? = 0 -a "${branch_name}" != "@BRANCH@" ]; then
   git checkout -f @BRANCH@
 fi
 git reset --hard origin/@BRANCH@