git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Felipe Contreras <felipe.contreras@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
	"SZEDER Gábor" <szeder.dev@gmail.com>,
	"Felipe Contreras" <felipe.contreras@gmail.com>
Subject: [PATCH v2 try2 1/4] completion: bash: fix prefix detection in branch.*
Date: Sun,  6 Jun 2021 13:47:23 -0500	[thread overview]
Message-ID: <20210606184726.1018460-2-felipe.contreras@gmail.com> (raw)
In-Reply-To: <20210606184726.1018460-1-felipe.contreras@gmail.com>

Otherwise we are completely ignoring the --cur argument.

The issue can be tested with:

  git clone --config=branch.<tab>

Reviewed-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
 contrib/completion/git-completion.bash | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index b50c5d0ea3..47b48fbab6 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -2649,8 +2649,8 @@ __git_complete_config_variable_name ()
 		return
 		;;
 	branch.*)
-		local pfx="${cur%.*}."
-		cur_="${cur#*.}"
+		local pfx="${cur_%.*}."
+		cur_="${cur_#*.}"
 		__gitcomp_direct "$(__git_heads "$pfx" "$cur_" ".")"
 		__gitcomp_nl_append $'autoSetupMerge\nautoSetupRebase\n' "$pfx" "$cur_" "$sfx"
 		return
-- 
2.31.1.2.g0532ba4bf6


  reply	other threads:[~2021-06-06 18:48 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-06 18:47 [PATCH v2 try2 0/4] completion: bash: a bunch of fixes Felipe Contreras
2021-06-06 18:47 ` Felipe Contreras [this message]
2021-06-06 18:47 ` [PATCH v2 try2 2/4] completion: bash: fix for suboptions with value Felipe Contreras
2021-06-06 18:47 ` [PATCH v2 try2 3/4] completion: bash: fix for multiple dash commands Felipe Contreras
2021-06-07 19:00   ` SZEDER Gábor
2021-06-07 19:11     ` Felipe Contreras
2021-06-08  5:15       ` Junio C Hamano
2021-06-08  5:49         ` Felipe Contreras
2021-06-06 18:47 ` [PATCH v2 try2 4/4] completion: bash: add correct suffix in variables Felipe Contreras
2021-06-07  0:46 ` [PATCH v2 try2 0/4] completion: bash: a bunch of fixes David Aguilar
2021-06-07  1:08   ` Junio C Hamano
2021-06-08  6:00 ` [PATCH v3 " Felipe Contreras
2021-06-08  6:00   ` [PATCH v3 1/4] completion: bash: fix prefix detection in branch.* Felipe Contreras
2021-06-08  6:00   ` [PATCH v3 2/4] completion: bash: fix for suboptions with value Felipe Contreras
2021-06-08  6:00   ` [PATCH v3 3/4] completion: bash: fix for multiple dash commands Felipe Contreras
2021-06-08  6:00   ` [PATCH v3 4/4] completion: bash: add correct suffix in variables Felipe Contreras

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=20210606184726.1018460-2-felipe.contreras@gmail.com \
    --to=felipe.contreras@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=szeder.dev@gmail.com \
    /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;
as well as URLs for NNTP newsgroup(s).