summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-08-29 21:50:01 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-08-29 21:50:01 (GMT)
commit4514de70c2e006f6b817498bf941d2b789feaaa7 (patch)
tree75c949475c4473fb0e6e0528e8aadf4f2a84931c
parent570f2933ff51ca41c17393657fd52c6d276b22fa (diff)
parent1af221ef5cb84c792303a0d16ca91197e2b70279 (diff)
downloadgit-4514de70c2e006f6b817498bf941d2b789feaaa7.zip
git-4514de70c2e006f6b817498bf941d2b789feaaa7.tar.gz
git-4514de70c2e006f6b817498bf941d2b789feaaa7.tar.bz2
Merge branch 'mg/rebase-i-onto-reflog-in-full'
The reflog entries left by "git rebase" and "git rebase -i" were inconsistent. * mg/rebase-i-onto-reflog-in-full: rebase -i: use full onto sha1 in reflog
-rw-r--r--git-rebase--interactive.sh3
1 files changed, 1 insertions, 2 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 0d2056f..a09e842 100644
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -569,11 +569,10 @@ do_next () {
test -s "$todo" && return
comment_for_reflog finish &&
- shortonto=$(git rev-parse --short $onto) &&
newhead=$(git rev-parse HEAD) &&
case $head_name in
refs/*)
- message="$GIT_REFLOG_ACTION: $head_name onto $shortonto" &&
+ message="$GIT_REFLOG_ACTION: $head_name onto $onto" &&
git update-ref -m "$message" $head_name $newhead $orig_head &&
git symbolic-ref \
-m "$GIT_REFLOG_ACTION: returning to $head_name" \