git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Felipe Contreras <felipe.contreras@gmail.com>
To: git@vger.kernel.org
Cc: Felipe Contreras <felipe.contreras@gmail.com>
Subject: [PATCH v1 02/43] completion: fix for suboptions with value
Date: Mon, 26 Apr 2021 11:14:17 -0500	[thread overview]
Message-ID: <20210426161458.49860-3-felipe.contreras@gmail.com> (raw)
In-Reply-To: <20210426161458.49860-1-felipe.contreras@gmail.com>

We need to ignore options that don't start with -- as well.

Depending on the value of COMP_WORDBREAKS, the last word could be
duplicated otherwise.

Can be tested with:

  git merge -X diff-algorithm=<tab>

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
 contrib/completion/git-completion.bash |  2 +-
 contrib/completion/git-completion.zsh  |  2 +-
 t/t9902-completion.sh                  | 15 +++++++++++++++
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 3323b770e1..e7173cfcdc 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -356,7 +356,7 @@ __gitcomp ()
 	local cur_="${3-$cur}"
 
 	case "$cur_" in
-	--*=)
+	*=)
 		;;
 	--no-*)
 		local c i=0 IFS=$' \t\n'
diff --git a/contrib/completion/git-completion.zsh b/contrib/completion/git-completion.zsh
index 6c56296997..69f90913db 100644
--- a/contrib/completion/git-completion.zsh
+++ b/contrib/completion/git-completion.zsh
@@ -55,7 +55,7 @@ __gitcomp ()
 	local cur_="${3-$cur}"
 
 	case "$cur_" in
-	--*=)
+	*=)
 		;;
 	--no-*)
 		local c IFS=$' \t\n'
diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh
index 04ce884ef5..7fc8eed375 100755
--- a/t/t9902-completion.sh
+++ b/t/t9902-completion.sh
@@ -540,6 +540,15 @@ test_expect_success '__gitcomp - expand/narrow all negative options' '
 	EOF
 '
 
+test_expect_success '__gitcomp - equal skip' '
+	test_gitcomp "--option=" "--option=" <<-\EOF &&
+
+	EOF
+	test_gitcomp "option=" "option=" <<-\EOF
+
+	EOF
+'
+
 test_expect_success '__gitcomp - doesnt fail because of invalid variable name' '
 	__gitcomp "$invalid_variable_name"
 '
@@ -2358,6 +2367,12 @@ test_expect_success 'git clone --config= - value' '
 	EOF
 '
 
+test_expect_success 'options with value' '
+	test_completion "git merge -X diff-algorithm=" <<-\EOF
+
+	EOF
+'
+
 test_expect_success 'sourcing the completion script clears cached commands' '
 	__git_compute_all_commands &&
 	verbose test -n "$__git_all_commands" &&
-- 
2.31.0


  parent reply	other threads:[~2021-04-26 16:15 UTC|newest]

Thread overview: 46+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-26 16:14 [PATCH v1 00/43] completion: git-completion 1.3.1 patches Felipe Contreras
2021-04-26 16:14 ` [PATCH v1 01/43] completion: bash: fix prefix detection in branch.* Felipe Contreras
2021-04-26 16:14 ` Felipe Contreras [this message]
2021-04-26 16:14 ` [PATCH v1 03/43] completion: bash: fix for multiple dash commands Felipe Contreras
2021-04-26 16:14 ` [PATCH v1 04/43] completion: bash: add correct suffix in variables Felipe Contreras
2021-04-26 16:14 ` [PATCH v1 05/43] completion: bash: do not modify COMP_WORDBREAKS Felipe Contreras
2021-04-26 16:14 ` [PATCH v1 06/43] test: completion: fix currently typed words Felipe Contreras
2021-04-26 16:14 ` [PATCH v1 07/43] test: completion: switch __gitcomp_nl prefix test Felipe Contreras
2021-04-26 16:14 ` [PATCH v1 08/43] test: completion: add run_func() helper Felipe Contreras
2021-04-26 16:14 ` [PATCH v1 09/43] completion: bash: remove non-append functionality Felipe Contreras
2021-04-26 16:14 ` [PATCH v1 10/43] completion: bash: get rid of _append() functions Felipe Contreras
2021-04-26 16:14 ` [PATCH v1 11/43] completion: bash: get rid of any non-append code Felipe Contreras
2021-04-26 16:14 ` [PATCH v1 12/43] completion: zsh: fix options with arguments Felipe Contreras
2021-04-26 16:14 ` [PATCH v1 13/43] completion: zsh: expand --git-dir file argument Felipe Contreras
2021-04-26 16:14 ` [PATCH v1 14/43] completion: zsh: add support for general -C opts Felipe Contreras
2021-04-26 16:14 ` [PATCH v1 15/43] completion: zsh: fix for undefined completions Felipe Contreras
2021-04-26 16:14 ` [PATCH v1 16/43] completion: zsh: add support for general -c opts Felipe Contreras
2021-04-26 16:14 ` [PATCH v1 17/43] completion: zsh: fix extra space on foo= Felipe Contreras
2021-04-26 16:14 ` [PATCH v1 18/43] completion: zsh: add excluded options Felipe Contreras
2021-04-26 16:14 ` [PATCH v1 19/43] completion: zsh: always set compset Felipe Contreras
2021-04-26 16:14 ` [PATCH v1 20/43] completion: factor out check in __gitcomp Felipe Contreras
2021-04-26 16:14 ` [PATCH v1 21/43] completion: simplify equal suffix check Felipe Contreras
2021-04-26 16:14 ` [PATCH v1 22/43] completion: refactor __gitcomp Felipe Contreras
2021-04-26 16:14 ` [PATCH v1 23/43] completion: simplify __gitcomp Felipe Contreras
2021-04-26 16:14 ` [PATCH v1 24/43] completion: bash: change suffix check in __gitcomp Felipe Contreras
2021-04-26 16:14 ` [PATCH v1 25/43] completion: improve __gitcomp suffix code Felipe Contreras
2021-04-26 16:14 ` [PATCH v1 26/43] completion: bash: simplify config_variable_name Felipe Contreras
2021-04-26 16:14 ` [PATCH v1 27/43] test: completion: add missing test Felipe Contreras
2021-04-26 16:14 ` [PATCH v1 28/43] completion: bash: improve __gitcomp description Felipe Contreras
2021-04-26 16:14 ` [PATCH v1 29/43] completion: add __gitcomp_opts Felipe Contreras
2021-04-26 16:14 ` [PATCH v1 30/43] completion: bash: cleanup __gitcomp* invocations Felipe Contreras
2021-04-26 16:14 ` [PATCH v1 31/43] completion: bash: shuffle __gitcomp functions Felipe Contreras
2021-04-26 16:14 ` [PATCH v1 32/43] completion: zsh: simplify __gitcomp_direct Felipe Contreras
2021-04-26 16:14 ` [PATCH v1 33/43] completion: zsh: shuffle __gitcomp* functions Felipe Contreras
2021-04-26 16:14 ` [PATCH v1 34/43] completion: zsh: fix direct quoting Felipe Contreras
2021-04-26 16:14 ` [PATCH v1 35/43] completion: zsh: add elements individually in __gitcomp_opts Felipe Contreras
2021-04-26 16:14 ` [PATCH v1 36/43] completion: zsh: add __gitcompadd helper Felipe Contreras
2021-04-26 16:14 ` [PATCH v1 37/43] completion: zsh: add correct removable suffix Felipe Contreras
2021-04-26 16:14 ` [PATCH v1 38/43] completion: bash: simplify _get_comp_words_by_ref() Felipe Contreras
2021-04-26 16:14 ` [PATCH v1 39/43] completion: bash: refactor _get_comp_words_by_ref() Felipe Contreras
2021-04-26 16:14 ` [PATCH v1 40/43] completion: bash: cleanup _get_comp_words_by_ref() Felipe Contreras
2021-04-26 16:14 ` [PATCH v1 41/43] completion: bash: trivial cleanup Felipe Contreras
2021-04-26 16:14 ` [PATCH v1 42/43] completion: bash: rename _get_comp_words_by_ref() Felipe Contreras
2021-04-26 16:14 ` [PATCH v1 43/43] completion: zsh: add higher-priority location Felipe Contreras
2021-05-06 23:55 ` [PATCH v1 00/43] completion: git-completion 1.3.1 patches Junio C Hamano
2021-05-07  2:17   ` 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

  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=20210426161458.49860-3-felipe.contreras@gmail.com \
    --to=felipe.contreras@gmail.com \
    --cc=git@vger.kernel.org \
    /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).