From: Sverre Rabbelier <srabbelier@gmail.com>
Date: Sun, 06 Nov 2011 19:35:09 GMT
Subject: Re: [PATCH] Add abbreviated commit hash to rebase conflict message
Message-ID: <CAGdFq_j7NxojZ+82s0GJ8ZF0oyd5sH8t0kcMOTQGtKbASXqYTA@mail.gmail.com>
In-Reply-To: <7vy5vt7uqo.fsf@alter.siamese.dyndns.org>

Heya,

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?

-- 
Cheers,

Sverre Rabbelier