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

2012-11-14 Thread Junio C Hamano
Junio C Hamano writes: > Phil Hord writes: > >> # tokens and short-status >> $ git status --tree --short >> ## changed-files >>M foo.txt > > Hrm, how will the existing readers of the output avoid getting > confused by this overloading of "##", which has meant the current > branch inf

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

2012-11-14 Thread Junio C Hamano
Phil Hord writes: > # tokens and short-status > $ git status --tree --short > ## changed-files >M foo.txt Hrm, how will the existing readers of the output avoid getting confused by this overloading of "##", which has meant the current branch information? > # tokens only? > $ git

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

2012-11-14 Thread Phil Hord
Junio C Hamano wrote: > Phil Hord writes: > >> Consider the usage: >> >> git status # show work-tree status >> git status --short # show short work-tree status >> git status --tokens # show work-tree status in token form > OK, your --tokens is more about *how* things are output, but it

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

2012-11-14 Thread Junio C Hamano
Phil Hord writes: > Consider the usage: > > git status # show work-tree status > git status --short # show short work-tree status > git status --tokens # show work-tree status in token form OK, your --tokens is more about *how* things are output, but it is unclear how it would interact

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

2012-11-14 Thread Phil Hord
Junio C Hamano wrote: > Phil Hord writes: > >>> Do you think '--tree-state' is an acceptable switch or do you have other >>> suggestions? >> I've been calling these 'tokens' myself. A token is a word-or-phrase I >> can parse easily with the default $IFS, for simpler script handling. > That name m

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

2012-11-14 Thread Junio C Hamano
Phil Hord writes: >> Do you think '--tree-state' is an acceptable switch or do you have other >> suggestions? > > I've been calling these 'tokens' myself. A token is a word-or-phrase I > can parse easily with the default $IFS, for simpler script handling. That name may be good for variables, bu

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

2012-11-13 Thread Phil Hord
Phil Hord wrote: > Junio C Hamano wrote: >> Phil Hord writes: >> >>> State token strings which may be emitted and their meanings: >>> merge a merge is in progress >>> am an am is in progress >>> am-is-emptythe am patch is empty >>> rebase

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

2012-11-12 Thread Phil Hord
Junio C Hamano wrote: > Phil Hord writes: > >> State token strings which may be emitted and their meanings: >> merge a merge is in progress >> am an am is in progress >> am-is-emptythe am patch is empty >> rebase a rebase is in progr

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

2012-11-12 Thread Junio C Hamano
Phil Hord writes: > State token strings which may be emitted and their meanings: > merge a merge is in progress > am an am is in progress > am-is-emptythe am patch is empty > rebase a rebase is in progress > rebase-interactive a

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

2012-11-09 Thread Phil Hord
Teach git-status to report the sequencer state in short form using a new --sequencer (-S) switch. Output zero or more simple state token strings indicating the deduced state of the git sequencer. Sequencer state info tokens are displayed in "short" form. 'git status --short -S' will show the nor