Re: [PATCH] Add abbreviated commit hash to rebase conflict message

From: Junio C Hamano <gitster@pobox.com>
Date: Nov 6, 2011, 00:31 UTC
Message-ID: <7v39e2852t.fsf@alter.siamese.dyndns.org>
In-Reply-To: <1320501759-27236-1-git-send-email-srabbelier@gmail.com>

Sverre Rabbelier <srabbelier@gmail.com> writes:

Show 6 quoted lines

> Also move the $msgnum to a more sensible location.
>
> Before:
> 	Patch failed at 0001 msg
> After:
> 	Patch 0001 failed at [da65151] msg

We can guess that 7-hexdigit is an abbreviated commit object name but the above description and the title do not tell the most important thing. What commit are you trying to describe, and why is it a good idea to show it?

> Reviewed-by: Eric Herman <eric@freesa.org>
> Reviewed-by: Fernando Vezzosi <buccia@repnz.net>
> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
> Signed-off-by: Sverre Rabbelier <srabbelier@gmail.com>

I wouldn't have issues if these were Helped-by or Asked-by or something, but a patch with Reviewed-by for which I do not see any trace of discussion on this list triggers some WTF at least for me.

Where did these reviews take place? What were their inputs and how was the patch improved based on them? Why I should trust the judgements of these people?

What happens when threeway is not enabled, and especially when "git am" is used for applying patches, not within rebase?

Show 15 quoted lines

> ---
>  git-am.sh |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/git-am.sh b/git-am.sh
> index 9042432..9d70588 100755
> --- a/git-am.sh
> +++ b/git-am.sh
> @@ -837,7 +837,8 @@ did you forget to use 'git add'?"
>  	fi
>  	if test $apply_status != 0
>  	then
> -		eval_gettextln 'Patch failed at $msgnum $FIRSTLINE'
> +		abbrev_commit=$(git log -1 --pretty=%h $commit)
> +		eval_gettextln 'Patch $msgnum failed at [$abbrev_commit] $FIRSTLINE'