Skip to content

Commit 4f89f6e

Browse files
committed
Correctly handles BRANCH being a tag
Fixes #837
1 parent 6dd4803 commit 4f89f6e

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

CMake/cdat_modules_extra/git_clone.sh.in

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,9 @@
22

33
cd "@CMAKE_INSTALL_PREFIX@"
44
"@GIT_EXECUTABLE@" clone --no-checkout --depth 1 -b @BRANCH@ @GIT_URL@ "@GIT_TARGET@"
5-
"@GIT_EXECUTABLE@" checkout origin/@BRANCH@
5+
cd "@GIT_TARGET@"
6+
if [ "$("@GIT_EXECUTABLE@" cat-file -t @BRANCH@)" = tag ]; then
7+
"@GIT_EXECUTABLE@" checkout @BRANCH@
8+
else
9+
"@GIT_EXECUTABLE@" checkout origin/@BRANCH@
10+
fi
Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
#!/bin/sh
22
cd "@SOURCE_DIR@"
33
"@GIT_EXECUTABLE@" fetch origin --prune
4-
"@GIT_EXECUTABLE@" checkout -f origin/@BRANCH@
4+
if [ "$("@GIT_EXECUTABLE@" cat-file -t @BRANCH@)" = tag ]; then
5+
"@GIT_EXECUTABLE@" checkout -f @BRANCH@
6+
else
7+
"@GIT_EXECUTABLE@" checkout -f origin/@BRANCH@
8+
fi

0 commit comments

Comments
 (0)