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

From: Junio C Hamano <gitster@pobox.com>
Date: Nov 6, 2011, 20:27 UTC
Message-ID: <7vaa89573r.fsf@alter.siamese.dyndns.org>
In-Reply-To: <CAGdFq_j7NxojZ+82s0GJ8ZF0oyd5sH8t0kcMOTQGtKbASXqYTA@mail.gmail.com>

Sverre Rabbelier <srabbelier@gmail.com> writes:

Show 11 quoted lines

> On Sun, Nov 6, 2011 at 05:14, Junio C Hamano <gitster@pobox.com> wrote:
>> I am puzzled, but that cannot be true. The existing message uses $msgnum
>> and $FIRSTLINE but does not use $commit because it does not necessarily
>> exist.
>>
>> What a value would the variable contain when I am applying your original
>> patch message using "git am -s" (or "git am -s3")?
>
> Aaah, I understand the concern you raise now. In that case a spurious
> [] would be printed, which I agree is less than desirable. Would
> checking 'if test -n $commit' be sufficient?

In what situation does it make sense to say "It came from _this_ commit"?

I think there is a separate variable that allows any part of the script if we are being run as a backend of rebase or not, and that is the condition you are looking for.