Permalink
Browse files

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
  • Loading branch information...
2 parents 570f293 + 1af221e commit 4514de70c2e006f6b817498bf941d2b789feaaa7 @gitster gitster committed Aug 29, 2012
Showing with 1 addition and 2 deletions.
  1. +1 −2 git-rebase--interactive.sh
View
3 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" \

0 comments on commit 4514de7

Please sign in to comment.