[beast/temp-rc1] mkrelease.sh: use robust HEAD==master check that also handles detached heads

[Tim Janik <timj src gnome org>]

commit 5a1021213dad80ef489ac8e796cdf6466256459c
Author: Tim Janik <timj gnu org>
Date:   Sun Jul 28 19:37:01 2013 +0200

    mkrelease.sh: use robust HEAD==master check that also handles detached heads

 mkrelease.sh |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/mkrelease.sh b/mkrelease.sh
index fe4b35b..516b0ff 100755
--- a/mkrelease.sh
+++ b/mkrelease.sh
@@ -299,8 +299,8 @@ done
   test "$REVISION" = `echo "$REVISION / 2 * 2" | bc` && ok \
     || fail "note: refusing to release development version with odd revision: $REVISION"
   msg "Checking master to be the current branch..."
-  CBRANCH=`git name-rev --always --name-only HEAD`
-  test "$CBRANCH" = master && ok \
+  CBRANCH=`{ git symbolic-ref -q HEAD || git rev-parse HEAD ; }`
+  test "$CBRANCH" = refs/heads/master && ok \
     || fail "note: expecting releases to be made from 'master' branch"
   msg "Checking HEAD to match upstream repository..."
   HBRANCH=`git symbolic-ref HEAD | sed s,^refs/heads/,,`