git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: "John Keeping" <john@keeping.me.uk>,
	"SZEDER Gábor" <szeder@ira.uka.de>,
	"Ramkumar Ramachandra" <artagnon@gmail.com>
Cc: git@vger.kernel.org, Thomas Braun <thomas.braun@virtuell-zuhause.de>
Subject: Re: [PATCH] completion: suggest sequencer commands for revert
Date: Fri, 29 May 2015 12:50:53 -0700	[thread overview]
Message-ID: <xmqq1thzcgde.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <1432547975.4644.5.camel@virtuell-zuhause.de> (Thomas Braun's message of "Mon, 25 May 2015 11:59:35 +0200")

Thomas Braun <thomas.braun@virtuell-zuhause.de> writes:

> Signed-off-by: Thomas Braun <thomas.braun@virtuell-zuhause.de>
> ---
>
> Hi,
>
> I added the sequencer commands for git revert. These are handy in case a git
> revert needs manual intervention.

This looks OK from a cursory read to me; asking opinions from those
who have touched the file in the recent past (Ram also happens to be
one of the people who were heavily involved in sequencer work).

Thanks.

>
> Thanks,
> Thomas
>
>  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"

  reply	other threads:[~2015-05-29 19:51 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 [this message]
2015-05-29 23:13   ` Ramkumar Ramachandra
2015-05-30 15:57     ` [PATCH v2 0/2] completion: sequencer commands Thomas Braun
2015-05-30 16:01     ` [PATCH v2 2/2] completion: suggest sequencer commands for revert 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=xmqq1thzcgde.fsf@gitster.dls.corp.google.com \
    --to=gitster@pobox.com \
    --cc=artagnon@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=john@keeping.me.uk \
    --cc=szeder@ira.uka.de \
    --cc=thomas.braun@virtuell-zuhause.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).