From 3a88873c5bd11ce50d2c0f8e2d74a933b58d16c4 Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Thu, 24 Mar 2016 12:58:18 +1100
Subject: [PATCH] use shorthash to avoid race when using a branch name

(cherry picked from commit fe3509768132e6b7c47c12511123d484c3cc68da)
---
 util/kit.sh | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/util/kit.sh b/util/kit.sh
index 1ab9b14976..b7adb0a8d0 100644
--- a/util/kit.sh
+++ b/util/kit.sh
@@ -77,21 +77,6 @@ cd $tmpdir || {
 	exit 1
 }
 
-verdir=bind9-kit.$$
-mkdir $verdir || {
-    echo "$0: could not create directory $tmpdir/$verdir" >&2
-    exit 1
-}
-git archive --format=tar $remote $tag version | ( cd $verdir ;tar xf - )
-test -f $verdir/version || {
-    echo "$0: could not get 'version' file" >&2
-    exit 1
-}
-. $verdir/version
-
-rm $verdir/version
-rmdir $verdir
-
 shorthash=`git ls-remote $repo refs/heads/$tag | cut -c1-7`
 if [ -z "$shorthash" ]; then
         shorthash=`git ls-remote $repo refs/tags/$tag | cut -c1-7`
@@ -101,6 +86,21 @@ if [ -z "$shorthash" ]; then
         exit 1
 fi
 
+verdir=bind9-kit.$$
+mkdir $verdir || {
+    echo "$0: could not create directory $tmpdir/$verdir" >&2
+    exit 1
+}
+git archive --format=tar $remote $shorthash version | ( cd $verdir ;tar xf - )
+test -f $verdir/version || {
+    echo "$0: could not get 'version' file" >&2
+    exit 1
+}
+. $verdir/version
+
+rm $verdir/version
+rmdir $verdir
+
 if $snapshot
 then
     RELEASETYPE=s
@@ -120,7 +120,7 @@ test ! -d $topdir || {
 
 mkdir $topdir || exit 1
 
-git archive --format=tar $remote $tag | ( cd $topdir; tar xf -)
+git archive --format=tar $remote $shorthash | ( cd $topdir; tar xf -)
 
 cd $topdir || exit 1