The output from a successful invocation of the shorthand command
"git rebase -" is something like "Fast-forwarded HEAD to @{-1}",
which includes a relative reference to a revision. Other commands
that use the shorthand "-", such as "git checkout -", typically
display the symbolic name of the revision.
Change rebase to output the symbolic name of the revision when using
the shorthand. For the example above, the new output is
"Fast-forwarded HEAD to master", assuming "@{-1}" is a reference to
"master".
- Use "git rev-parse" to retreive the name of the rev.
- Update the tests in light of this new behavior.
Requested-by: John Keeping <john@xxxxxxxxxxxxx>
Signed-off-by: Brian Gesiak <modocache@xxxxxxxxx>
---
git-rebase.sh | 8 +++++++-
t/t3400-rebase.sh | 4 +---
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/git-rebase.sh b/git-rebase.sh
index 2c75e9f..42d34a6 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -455,7 +455,13 @@ then
*) upstream_name="$1"
if test "$upstream_name" = "-"
then
- upstream_name="@{-1}"
+ upstream_name=`git rev-parse --symbolic-full-name @{-1}`
+ if test -n "$upstream_name"
+ then
+ upstream_name=${upstream_name#refs/heads/}
+ else
+ upstream_name="@{-1}"
+ fi
fi
shift
;;
diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh
index 80e0a95..2b99940 100755
--- a/t/t3400-rebase.sh
+++ b/t/t3400-rebase.sh
@@ -91,7 +91,7 @@ test_expect_success 'rebase from ambiguous branch name' '
test_expect_success 'rebase off of the previous branch using "-"' '
git checkout master &&
git checkout HEAD^ &&
- git rebase @{-1} >expect.messages &&
+ git rebase master >expect.messages &&
git merge-base master HEAD >expect.forkpoint &&
git checkout master &&
@@ -100,8 +100,6 @@ test_expect_success 'rebase off of the previous branch using "-"' '
git merge-base master HEAD >actual.forkpoint &&
test_cmp expect.forkpoint actual.forkpoint &&
- # the next one is dubious---we may want to say "-",
- # instead of @{-1}, in the message
test_i18ncmp expect.messages actual.messages
'
--
1.9.0.259.gc5d75e8.dirty
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html