undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rebase -i: use full onto sha1 in reflog

Browse Source 
'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>
This commit is contained in:
Michael J Gruber 2012-08-10 08:51:19 +02:00 committed by Junio C Hamano
parent 785ee4960c
commit 1af221ef5c
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
git-rebase--interactive.sh
View File

@ -533,11 +533,10 @@ do_next () {
test -s "$todo" && return test -s "$todo" && return
comment_for_reflog finish && comment_for_reflog finish &&
shortonto=$(git rev-parse --short $onto) &&
newhead=$(git rev-parse HEAD) && newhead=$(git rev-parse HEAD) &&
case $head_name in case $head_name in
refs/*) 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 update-ref -m "$message" $head_name $newhead $orig_head &&
git symbolic-ref \ git symbolic-ref \
-m "$GIT_REFLOG_ACTION: returning to $head_name" \ -m "$GIT_REFLOG_ACTION: returning to $head_name" \