diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-09-10 15:26:03 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-10 15:26:03 -0700 |
| commit | 73eb89e75949e7bc52515223a051aee0b986bbec (patch) | |
| tree | 393c36b3096c3bd318dd3ada094783cccc06e771 /git-rebase--interactive.sh | |
| parent | 7cc51cfe5ebb4fc23221ebcb050b527b89ebc0bc (diff) | |
| parent | 1af221ef5cb84c792303a0d16ca91197e2b70279 (diff) | |
| download | git-73eb89e75949e7bc52515223a051aee0b986bbec.tar.gz git-73eb89e75949e7bc52515223a051aee0b986bbec.tar.xz | |
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
Diffstat (limited to 'git-rebase--interactive.sh')
| -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 0c19b7c75..84926783d 100644 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -548,11 +548,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" \ |