merge script: notice @{-1} shorthand
Port v1.6.2-rc1~10^2 (Teach @{-1} to git merge, 2009-02-13) to
the old merge script.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff --git a/contrib/examples/git-merge.sh b/contrib/examples/git-merge.sh
index 5a2addd..bed55a4 100755
--- a/contrib/examples/git-merge.sh
+++ b/contrib/examples/git-merge.sh
@@ -148,13 +148,15 @@
if found_ref=$(git rev-parse --symbolic-full-name --verify \
"$remote" 2>/dev/null)
then
+ expanded=$(git check-ref-format --branch "$remote") ||
+ exit
if test "${found_ref#refs/heads/}" != "$found_ref"
then
- echo "$rh branch '$remote' of ."
+ echo "$rh branch '$expanded' of ."
return
elif test "${found_ref#refs/remotes/}" != "$found_ref"
then
- echo "$rh remote branch '$remote' of ."
+ echo "$rh remote branch '$expanded' of ."
return
fi
fi
