Skip to content

Commit 4514de7

Browse files
committed
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
2 parents 570f293 + 1af221e commit 4514de7

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
@@ -569,11 +569,10 @@ do_next () {
569569
test -s "$todo" && return
570570

571571
comment_for_reflog finish &&
572-
shortonto=$(git rev-parse --short $onto) &&
573572
newhead=$(git rev-parse HEAD) &&
574573
case $head_name in
575574
refs/*)
576-
message="$GIT_REFLOG_ACTION: $head_name onto $shortonto" &&
575+
message="$GIT_REFLOG_ACTION: $head_name onto $onto" &&
577576
git update-ref -m "$message" $head_name $newhead $orig_head &&
578577
git symbolic-ref \
579578
-m "$GIT_REFLOG_ACTION: returning to $head_name" \

0 commit comments

Comments
 (0)