Skip to content

Commit 73eb89e

Browse files
committed
Merge branch 'mg/rebase-i-onto-reflog-in-full' into maint-1.7.11
The reflog entries left by "git rebase" and "git rebase -i" were inconsistent (the interactive one gave an abbreviated object name). * mg/rebase-i-onto-reflog-in-full: rebase -i: use full onto sha1 in reflog
2 parents 7cc51cf + 1af221e commit 73eb89e

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

git-rebase--interactive.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -548,11 +548,10 @@ do_next () {
548548
test -s "$todo" && return
549549

550550
comment_for_reflog finish &&
551-
shortonto=$(git rev-parse --short $onto) &&
552551
newhead=$(git rev-parse HEAD) &&
553552
case $head_name in
554553
refs/*)
555-
message="$GIT_REFLOG_ACTION: $head_name onto $shortonto" &&
554+
message="$GIT_REFLOG_ACTION: $head_name onto $onto" &&
556555
git update-ref -m "$message" $head_name $newhead $orig_head &&
557556
git symbolic-ref \
558557
-m "$GIT_REFLOG_ACTION: returning to $head_name" \

0 commit comments

Comments
 (0)