diff mbox series

[v1,41/43] completion: bash: trivial cleanup

Message ID	20210426161458.49860-42-felipe.contreras@gmail.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <git-owner@kernel.org> From: Felipe Contreras <felipe.contreras@gmail.com> To: git@vger.kernel.org Cc: Felipe Contreras <felipe.contreras@gmail.com> Subject: [PATCH v1 41/43] completion: bash: trivial cleanup Date: Mon, 26 Apr 2021 11:14:56 -0500 Message-Id: <20210426161458.49860-42-felipe.contreras@gmail.com> In-Reply-To: <20210426161458.49860-1-felipe.contreras@gmail.com> References: <20210426161458.49860-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	completion: git-completion 1.3.1 patches \| expand [v1,00/43] completion: git-completion 1.3.1 patches [v1,01/43] completion: bash: fix prefix detection in branch.* [v1,02/43] completion: fix for suboptions with value [v1,03/43] completion: bash: fix for multiple dash commands [v1,04/43] completion: bash: add correct suffix in variables [v1,05/43] completion: bash: do not modify COMP_WORDBREAKS [v1,06/43] test: completion: fix currently typed words [v1,07/43] test: completion: switch __gitcomp_nl prefix test [v1,08/43] test: completion: add run_func() helper [v1,09/43] completion: bash: remove non-append functionality [v1,10/43] completion: bash: get rid of _append() functions [v1,11/43] completion: bash: get rid of any non-append code [v1,12/43] completion: zsh: fix options with arguments [v1,13/43] completion: zsh: expand --git-dir file argument [v1,14/43] completion: zsh: add support for general -C opts [v1,15/43] completion: zsh: fix for undefined completions [v1,16/43] completion: zsh: add support for general -c opts [v1,17/43] completion: zsh: fix extra space on foo= [v1,18/43] completion: zsh: add excluded options [v1,19/43] completion: zsh: always set compset [v1,20/43] completion: factor out check in __gitcomp [v1,21/43] completion: simplify equal suffix check [v1,22/43] completion: refactor __gitcomp [v1,23/43] completion: simplify __gitcomp [v1,24/43] completion: bash: change suffix check in __gitcomp [v1,25/43] completion: improve __gitcomp suffix code [v1,26/43] completion: bash: simplify config_variable_name [v1,27/43] test: completion: add missing test [v1,28/43] completion: bash: improve __gitcomp description [v1,29/43] completion: add __gitcomp_opts [v1,30/43] completion: bash: cleanup __gitcomp* invocations [v1,31/43] completion: bash: shuffle __gitcomp functions [v1,32/43] completion: zsh: simplify __gitcomp_direct [v1,33/43] completion: zsh: shuffle __gitcomp* functions [v1,34/43] completion: zsh: fix direct quoting [v1,35/43] completion: zsh: add elements individually in __gitcomp_opts [v1,36/43] completion: zsh: add __gitcompadd helper [v1,37/43] completion: zsh: add correct removable suffix [v1,38/43] completion: bash: simplify _get_comp_words_by_ref() [v1,39/43] completion: bash: refactor _get_comp_words_by_ref() [v1,40/43] completion: bash: cleanup _get_comp_words_by_ref() [v1,41/43] completion: bash: trivial cleanup [v1,42/43] completion: bash: rename _get_comp_words_by_ref() [v1,43/43] completion: zsh: add higher-priority location

Commit Message

Felipe Contreras April 26, 2021, 4:14 p.m. UTC

The most typical case first (COMP_WORDBREAKS contains our wanted words).

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
 contrib/completion/git-completion.bash | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff mbox series

Patch

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 4b01de38a9..1cd249383b 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -355,9 +355,7 @@  _get_comp_words_by_ref ()
 	# Which word separators to exclude?
 	exclude="${COMP_WORDBREAKS//[^=:]}"
 	cword=$COMP_CWORD
-	if [ -z "$exclude" ]; then
-		words=("${COMP_WORDS[@]}")
-	else
+	if [ -n "$exclude" ]; then
 		# List of word completion separators has shrunk;
 		# re-assemble words to complete.
 		for ((i=0, j=0; i < ${#COMP_WORDS[@]}; i++, j++)); do
@@ -392,6 +390,8 @@  _get_comp_words_by_ref ()
 				cword=$j
 			fi
 		done
+	else
+		words=("${COMP_WORDS[@]}")
 	fi
 
 	cur=${words[cword]}