From: Thomas Braun <thomas.braun@virtuell-zuhause.de>
To: git@vger.kernel.org
Cc: "Ramkumar Ramachandra" <artagnon@gmail.com>,
"Junio C Hamano" <gitster@pobox.com>,
"John Keeping" <john@keeping.me.uk>,
"SZEDER Gábor" <szeder@ira.uka.de>
Subject: [PATCH v2 0/2] completion: sequencer commands
Date: Sat, 30 May 2015 17:57:32 +0200 [thread overview]
Message-ID: <1433001452.5113.4.camel@virtuell-zuhause.de> (raw)
In-Reply-To: <CALkWK0m9Fj_3AnJcENL-kAFSbYjW4fKpN76Tftrt672hQj4qww@mail.gmail.com>
Ramkumar Ramachandra wrote:
> 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.
next prev parent reply other threads:[~2015-05-30 16:01 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-25 9:59 [PATCH] completion: suggest sequencer commands for revert Thomas Braun
2015-05-29 19:50 ` Junio C Hamano
2015-05-29 23:13 ` Ramkumar Ramachandra
2015-05-30 15:57 ` Thomas Braun [this message]
2015-05-30 16:01 ` [PATCH v2 2/2] " Thomas Braun
2015-05-30 16:01 ` [PATCH v2 1/2] completion: Add sequencer function Thomas Braun
2015-05-30 19:01 ` SZEDER Gábor
2015-06-01 14:38 ` Junio C Hamano
2015-06-01 15:06 ` SZEDER Gábor
2015-05-30 16:02 ` Thomas Braun
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1433001452.5113.4.camel@virtuell-zuhause.de \
--to=thomas.braun@virtuell-zuhause.de \
--cc=artagnon@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=john@keeping.me.uk \
--cc=szeder@ira.uka.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).