Re: [PATCH] rebase-i: print abbreviated hash when stop for editing
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Mar 24, 2016, 19:56 UTC
- Message-ID
- <xmqqfuvf8xav.fsf@gitster.mtv.corp.google.com>
- In-Reply-To
- <1458844281-13107-1-git-send-email-ralf.thielow@gmail.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)?
Show 17 quoted lines
> 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)