From: Michael J Gruber <git@drmicha.warpmail.net>
Date: Fri, 10 Aug 2012 06:51:19 +0000 (+0200)
Subject: rebase -i: use full onto sha1 in reflog
X-Git-Tag: v1.7.11.6~17^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1af221ef5cb84c792303a0d16ca91197e2b70279;p=thirdparty%2Fgit.git

rebase -i: use full onto sha1 in reflog

'git rebase' uses the full onto sha1 for the reflog message whereas 'git
rebase -i' uses the short sha1. This is not only inconsistent, but can
lead to problems when the reflog is inspected at a later time at which
that abbreviation may have become ambiguous.

Make 'rebase -i' use the full onto sha1, as well.

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 2e1325824c..905346084c 100644
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -533,11 +533,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" \