Re: [PATCHv3 3/4] git-status: show short sequencer state

From: Junio C Hamano <gitster@pobox.com>
Date: Nov 12, 2012, 17:45 UTC
Message-ID: <7vip9aiuk8.fsf@alter.siamese.dyndns.org>
In-Reply-To: <1352487385-5929-4-git-send-email-hordp@cisco.com>

Phil Hord <hordp@cisco.com> writes:

Show 19 quoted lines

> State token strings which may be emitted and their meanings:
>     merge              a merge is in progress
>     am                 an am is in progress
>     am-is-empty        the am patch is empty
>     rebase             a rebase is in progress
>     rebase-interactive an interactive rebase is in progress
>     cherry-pick        a cherry-pick is in progress
>     bisect             a bisect is in progress
>     conflicted         there are unresolved conflicts
>     commit-pending     a commit operation is waiting to be completed
>     splitting          interactive rebase, commit is being split
>
> I also considered adding these tokens, but I decided it was not
> appropriate since these changes are not sequencer-related.  But
> it is possible I am being too short-sighted or have chosen the
> switch name poorly.
>     changed-index  Changes exist in the index
>     changed-files  Changes exist in the working directory
>     untracked      New files exist in the working directory

I tend to agree; unlike all the normal output from "status -s" that are per-file, the above are the overall states of the working tree.

It is just that most of the "overall states" look as if they are dominated by "sequencer states", but that is only because you chose to call states related to things like "am" and "bisect" that are not sequencer states as such.

It probably should be called the tree state, working tree state, or somesuch.