From: Ralf Thielow <ralf.thielow@gmail.com>
Date: Thu, 24 Mar 2016 21:06:37 GMT
Subject: Re: [PATCH] rebase-i: print abbreviated hash when stop for editing
Message-ID: <CAN0XMOJKq7nvyVu57g=Fi3195oG4pDbL7mw3urL33iJDb4Y0cA@mail.gmail.com>
In-Reply-To: <xmqqfuvf8xav.fsf@gitster.mtv.corp.google.com>

2016-03-24 20:56 GMT+01:00 Junio C Hamano <gitster@pobox.com>:
> Ralf Thielow <ralf.thielow@gmail.com> writes:
>
>> Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
>> ---
>
> Hmph, the reason why this is a good thing to do is because an
> overlong $sha1 would push $rest too far to the right (possibly
> making it overflow to the next line)?
>

Yes.  Another solution would have been to remove the "..." at the
end, but I prefer to see a shorter message rather than having
the full sha1 for whatever reason.

>
>>  git-rebase--interactive.sh | 3 ++-
>>  1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
>> index 4cde685..9ea3075 100644
>> --- a/git-rebase--interactive.sh
>> +++ b/git-rebase--interactive.sh
>> @@ -548,7 +548,8 @@ do_next () {
>>
>>               mark_action_done
>>               do_pick $sha1 "$rest"
>> -             warn "Stopped at $sha1... $rest"
>> +             sha1_abbrev=$(git rev-parse --short $sha1)
>> +             warn "Stopped at $sha1_abbrev... $rest"
>>               exit_with_patch $sha1 0
>>               ;;
>>       squash|s|fixup|f)