Skip to content

Commit

Permalink
Merge branch 'mg/rebase-i-onto-reflog-in-full'
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Junio C Hamano committed Aug 29, 2012
2 parents 570f293 + 1af221e commit 4514de7
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions git-rebase--interactive.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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" \
Expand Down

0 comments on commit 4514de7

Please sign in to comment.