[PATCH v2 0/2] completion: sequencer commands
- From
Thomas Braun <thomas.braun@virtuell-zuhause.de>
- Date
- May 30, 2015, 15:57 UTC
- Message-ID
- <1433001452.5113.4.camel@virtuell-zuhause.de>
- In-Reply-To
- <CALkWK0m9Fj_3AnJcENL-kAFSbYjW4fKpN76Tftrt672hQj4qww@mail.gmail.com>
Ramkumar Ramachandra wrote:
Show 34 quoted lines
> Junio C Hamano wrote:
> >
> > > contrib/completion/git-completion.bash | 5 +++++
> > > 1 file changed, 5 insertions(+)
> > >
> > > diff --git a/contrib/completion/git-completion.bash
> b/contrib/completion/git-completion.bash
> > > index bfc74e9..3c00acd 100644
> > > --- a/contrib/completion/git-completion.bash
> > > +++ b/contrib/completion/git-completion.bash
> > > @@ -2282,6 +2282,11 @@ _git_reset ()
> > >
> > > _git_revert ()
> > > {
> > > + local dir="$(__gitdir)"
> > > + if [ -f "$dir"/REVERT_HEAD ]; then
> > > + __gitcomp "--continue --quit --abort"
> > > + return
> > > + fi
> > > case "$cur" in
> > > --*)
> > > __gitcomp "--edit --mainline --no-edit --no-commit
> --signoff"
>
> This corresponds exactly to what we do for git-cherry-pick:
>
> local dir="$(__gitdir)"
> if [ -f "$dir"/CHERRY_PICK_HEAD ]; then
> __gitcomp "--continue --quit --abort"
> return
> fi
>
> Perhaps _git_revert() and _git_cherry_pick() should call into the same
> function with different arguments.Good idea. I created a new function __git_complete_sequencer which is now used to complete all commands with active sequencer.