From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 30 May 2012 04:27:16 GMT
Subject: Re: [PATCHv2 1/2] wt-status: better advices for git status
Message-ID: <7vbol61efv.fsf@alter.siamese.dyndns.org>
In-Reply-To: <vpqwr3whjkp.fsf@bauges.imag.fr>

Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> writes:

> Junio C Hamano <gitster@pobox.com> writes:
>
>> These are not independent (you cannot be in bisect and am at the
>> same time).
>
> You should not, but it seems you can. At least, I just successfully
> started a "git am" during a "git bisect".

Yeah, that actually is a sensible thing to support (and I am happy
to hear it still works).

> The variable naming is wrong (it could be s/conflicts/unmerged_present/
> and s/unmerged_state/merge_in_progress/ for example). But these two
> variables are indeed independant. You can have unmerged path without an
> actual merge in progress (conflicts during "git am"), an you can have a
> merge in progress without conflicts (if you've just "git add"-ed them).