Correctly handles BRANCH being a tag

Fixes #837
CDAT · Jan 29, 2015 · 1ddc15d · 1ddc15d
1 parent 6dd4803
commit 1ddc15d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/CMake/cdat_modules_extra/git_clone.sh.in b/CMake/cdat_modules_extra/git_clone.sh.in
@@ -2,4 +2,8 @@
 
 cd "@CMAKE_INSTALL_PREFIX@"
 "@GIT_EXECUTABLE@" clone --no-checkout --depth 1 -b @BRANCH@ @GIT_URL@ "@GIT_TARGET@"
-"@GIT_EXECUTABLE@" checkout origin/@BRANCH@
+if [ $("@GIT_EXECUTABLE@" cat-file -t @BRANCH@) = tag ]; then
+    "@GIT_EXECUTABLE@" checkout @BRANCH@
+else
+    "@GIT_EXECUTABLE@" checkout origin/@BRANCH@
+fi
diff --git a/CMake/cdat_modules_extra/git_update.sh.in b/CMake/cdat_modules_extra/git_update.sh.in
@@ -1,4 +1,8 @@
 #!/bin/sh
 cd "@SOURCE_DIR@"
 "@GIT_EXECUTABLE@" fetch origin --prune
-"@GIT_EXECUTABLE@" checkout -f origin/@BRANCH@
+if [ $("@GIT_EXECUTABLE@" cat-file -t @BRANCH@) = tag ]; then
+    "@GIT_EXECUTABLE@" checkout -f @BRANCH@
+else
+    "@GIT_EXECUTABLE@" checkout -f origin/@BRANCH@
+fi