diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-08-29 14:50:01 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-08-29 14:50:01 -0700 |
| commit | 4514de70c2e006f6b817498bf941d2b789feaaa7 (patch) | |
| tree | 75c949475c4473fb0e6e0528e8aadf4f2a84931c | |
| parent | Merge branch 'mz/empty-rebase-test' (diff) | |
| parent | rebase -i: use full onto sha1 in reflog (diff) | |
| download | tgif-4514de70c2e006f6b817498bf941d2b789feaaa7.tar.xz | |
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.sh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 0d2056f027..a09e8423dd 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" \ |