Git development
 help / color / mirror / Atom feed
From: "SZEDER Gábor" <szeder.dev@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Jeff King <peff@peff.net>, Paul Jolly <paul@myitcv.io>,
	git@vger.kernel.org
Subject: Re: Bash completion suggests tags for git branch -D
Date: Wed, 3 Feb 2021 21:00:47 +0100	[thread overview]
Message-ID: <20210203200047.GB1036595@szeder.dev> (raw)
In-Reply-To: <xmqqpn1igznk.fsf@gitster.c.googlers.com>

On Tue, Feb 02, 2021 at 09:14:39AM -0800, Junio C Hamano wrote:
> From: Jeff King <peff@peff.net>
> Date: Tue Feb 2 04:02:13 2021 -0500
> Subject: [PATCH] completion: treat "branch -D" the same way as "branch -d"
> 
> Paul Jolly noticed that the former offers not just branches but tags
> as completion candidates.  Mimic how "branch -d" limits its suggestion
> to branch names.

Uh-oh.  This is a bug from my second ever commit in Git! ;)

'-M' should be handled the same.

> Signed-off-by: Jeff King <peff@peff.net>
> Signed-off-by: Junio C Hamano <gitster@pobox.com>
> ---
>  contrib/completion/git-completion.bash | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
> index 4b1f4264a6..b54113e2f9 100644
> --- a/contrib/completion/git-completion.bash
> +++ b/contrib/completion/git-completion.bash
> @@ -1447,7 +1447,7 @@ _git_branch ()
>  	while [ $c -lt $cword ]; do
>  		i="${words[c]}"
>  		case "$i" in
> -		-d|--delete|-m|--move)	only_local_ref="y" ;;
> +		-d|--delete|-D|-m|--move)	only_local_ref="y" ;;
>  		-r|--remotes)		has_r="y" ;;
>  		esac
>  		((c++))
> -- 
> 2.30.0-586-g047f30a795
> 

  parent reply	other threads:[~2021-02-03 20:01 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-02-02  6:01 Bash completion suggests tags for git branch -D Paul Jolly
2021-02-02  9:02 ` Jeff King
2021-02-02  9:21   ` Jeff King
2021-02-02 17:14     ` Junio C Hamano
2021-02-02 17:24       ` Eric Sunshine
2021-02-02 21:29         ` Junio C Hamano
2021-02-02 19:38       ` Jeff King
2021-02-02 20:25         ` Paul Jolly
2021-02-03 20:00       ` SZEDER Gábor [this message]
2021-02-03 20:59         ` [PATCH] completion: handle other variants of "branch -m" Jeff King

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210203200047.GB1036595@szeder.dev \
    --to=szeder.dev@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=paul@myitcv.io \
    --cc=peff@peff.net \
    /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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox