summaryrefslogtreecommitdiff
path: root/contrib/examples
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2010-08-17 07:11:30 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-08-18 21:02:05 (GMT)
commitc2c9a87d4f5a643ef93db7c39fc01c4965bf67a3 (patch)
tree336f75668bffdb70e92dcdb0cbf5b4769260ef6f /contrib/examples
parent2a70fa4f1e377bc68bcabdc1a550e9970acccda7 (diff)
downloadgit-c2c9a87d4f5a643ef93db7c39fc01c4965bf67a3.zip
git-c2c9a87d4f5a643ef93db7c39fc01c4965bf67a3.tar.gz
git-c2c9a87d4f5a643ef93db7c39fc01c4965bf67a3.tar.bz2
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>
Diffstat (limited to 'contrib/examples')
-rwxr-xr-xcontrib/examples/git-merge.sh6
1 files changed, 4 insertions, 2 deletions
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 @@ merge_name () {
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