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

From: Sverre Rabbelier <srabbelier@gmail.com>
Date: Nov 6, 2011, 20:42 UTC
Message-ID: <CAGdFq_gS2fV5B26ZBOLs=5L_rnaeORmKW49OxwbP-+vx+ZN8cQ@mail.gmail.com>
In-Reply-To: <7vaa89573r.fsf@alter.siamese.dyndns.org>

Heya,

On Sun, Nov 6, 2011 at 21:27, Junio C Hamano <gitster@pobox.com> wrote:

Show 5 quoted lines

> 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.

The closest I could find is:

                if test -f "$dotest/rebasing"

Which is exactly the case when commit is set. Do you prefer the "-f $dotest/rebasing" test or the "-n $commit" one?

-- 
Cheers,

Sverre Rabbelier