Re: [PATCH 5/6] status: do not depend on flaky reflog messages

From: Ramkumar Ramachandra <artagnon@gmail.com>
Date: Jun 16, 2013, 06:07 UTC
Message-ID: <CALkWK0kzGTHMv2x8mrgftVGX1OwtvVdb9_8jrXnV=fQCfPw9XQ@mail.gmail.com>
In-Reply-To: <7vip1ek37o.fsf@alter.siamese.dyndns.org>

Junio C Hamano wrote:

> [...]

I have no desire to argue incessantly.  I just want a solution to the problem!

Show 6 quoted lines

> A rerolled series that does:
>
>  - Tweak wt-status.c to take information not from reflog, when
>    detached during rebase (this may need to tweak existing tests,
>    as different "rebase" modes may use 'checkout' liberally in
>    different ways);

Please be more specific, and tell me what it should print when a rebase is in progress. Would a constant

  # rebase in progress; onto $ONTO

be sufficient?

>  - Teach builtin/commit.c to pay attention to reflog-action; thanks
>    to the previous step, this will not have to change the tests;

Where did builtin/commit.c enter into the equation? Doesn't it already respect GIT_REFLOG_ACTION? See line 1461.

>  - Update the reflog message rebase uses, but again this will not
>    affect wt-status.c at all.

Okay.