build-snapshot: Fix building non-"master" branches

Fix the problem that build-snapshot failed to checkout remote branches.

1 files changed, 5 insertions, 3 deletions

diff --git a/bin/build-snapshot b/bin/build-snapshot
index 651edd7..43c6293 100755
--- a/bin/build-snapshot
+++ b/bin/build-snapshot
@@ -38,7 +38,9 @@ create_snapshot()
         branch=$1
         snapshot_dir=$2
 
-        git checkout --quiet "$branch"
+        git show-ref --verify --quiet "refs/heads/$branch" \
+            || git checkout --quiet --track "origin/$branch"
+
         version=$(git describe --abbrev=4 'HEAD' | sed 's/release-//')
         tarball="nagios-plugins-$version.tar.gz"
         symlink="nagios-plugins-$branch.tar.gz"
@@ -70,12 +72,12 @@ trap 'tail -n 25 "$log_file" >&3; rm -rf "$temp_dir"' EXIT
 set -x
 
 src_dir="$temp_dir/src"
-git clone --quiet --shared "$repository" "$src_dir"
+git clone --quiet --shared --no-checkout "$repository" "$src_dir"
 cd "$src_dir"
 
 for branch in $branches
 do
-        git show-ref --verify "refs/heads/$branch" \
+        git show-ref --verify "refs/remotes/origin/$branch" \
             && create_snapshot "$branch" "$snapshot_dir"
 done