[PATCHv2] rebase -i: use full onto sha1 in reflog
- From
Michael J Gruber <git@drmicha.warpmail.net>
- Date
- Aug 10, 2012, 06:51 UTC
- Message-ID
- <54180665e1207275db9694cd68f49ff96812284e.1344581316.git.git@drmicha.warpmail.net>
- In-Reply-To
- <7vwr18nehe.fsf@alter.siamese.dyndns.org>
'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> --- So, this is without the now superfluous shortonto definition.
The other place where shortonto is defined is still needed.
git-rebase--interactive.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 0d2056f..a09e842 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" \
-- 1.7.12.rc2.245.g4f94e02