[v2,13/26] completion: bash: simplify __gitcomp

Message ID	20201110212136.870769-14-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: Junio C Hamano <gitster@pobox.com>, =?utf-8?q?SZEDER_G=C3=A1bor?= <szeder.dev@gmail.com>, Felipe Contreras <felipe.contreras@gmail.com> Subject: [PATCH v2 13/26] completion: bash: simplify __gitcomp Date: Tue, 10 Nov 2020 15:21:23 -0600 Message-Id: <20201110212136.870769-14-felipe.contreras@gmail.com> In-Reply-To: <20201110212136.870769-1-felipe.contreras@gmail.com> References: <20201110212136.870769-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	completion: bash: a bunch of fixes, cleanups, and reorganization \| expand [v2,00/26] completion: bash: a bunch of fixes, cleanups, and reorganization [v2,01/26] completion: bash: fix prefix detection in branch.* [v2,02/26] completion: bash: add correct suffix in variables [v2,03/26] completion: bash: fix for suboptions with value [v2,04/26] completion: bash: do not modify COMP_WORDBREAKS [v2,05/26] test: completion: fix currently typed words [v2,06/26] test: completion: add run_func() helper [v2,07/26] completion: bash: remove non-append functionality [v2,08/26] completion: bash: get rid of _append() functions [v2,09/26] completion: bash: get rid of any non-append code [v2,10/26] completion: bash: factor out check in __gitcomp [v2,11/26] completion: bash: simplify equal suffix check [v2,12/26] completion: bash: refactor __gitcomp [v2,13/26] completion: bash: simplify __gitcomp [v2,14/26] completion: bash: change suffix check in __gitcomp [v2,15/26] completion: bash: improve __gitcomp suffix code [v2,16/26] completion: bash: simplify config_variable_name [v2,17/26] test: completion: switch __gitcomp_nl prefix test [v2,18/26] completion: bash: simplify _get_comp_words_by_ref() [v2,19/26] completion: bash: refactor _get_comp_words_by_ref() [v2,20/26] completion: bash: cleanup _get_comp_words_by_ref() [v2,21/26] completion: bash: trivial cleanup [v2,22/26] completion: bash: rename _get_comp_words_by_ref() [v2,23/26] completion: bash: improve __gitcomp description [v2,24/26] completion: bash: add __gitcomp_opts [v2,25/26] completion: bash: cleanup __gitcomp* invocations [v2,26/26] completion: bash: shuffle __gitcomp functions

Message ID

20201110212136.870769-14-felipe.contreras@gmail.com (mailing list archive)

State

New, archived

Headers

From: Felipe Contreras <felipe.contreras@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
 =?utf-8?q?SZEDER_G=C3=A1bor?= <szeder.dev@gmail.com>,
 Felipe Contreras <felipe.contreras@gmail.com>
Subject: [PATCH v2 13/26] completion: bash: simplify __gitcomp
Date: Tue, 10 Nov 2020 15:21:23 -0600
Message-Id: <20201110212136.870769-14-felipe.contreras@gmail.com>
In-Reply-To: <20201110212136.870769-1-felipe.contreras@gmail.com>
References: <20201110212136.870769-1-felipe.contreras@gmail.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

completion: bash: a bunch of fixes, cleanups, and reorganization | expand

Commit Message

Felipe Contreras Nov. 10, 2020, 9:21 p.m. UTC

It's not possible for $cur_ to have anything more than --no- at this
point, so there's no need to add a suffix, nor check anything else.

All we are doing is checking that $cur_ matches --no, and adding a
completion if so.

This way the code reflects what we are doing.

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

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 8b4308fc99..9f5dd4e3e7 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -332,9 +332,8 @@  __gitcomp ()
 				continue
 			fi
 
-			c="--no-...${4-}"
-			if [[ $c == "$cur_"* ]]; then
-				COMPREPLY[i++]="${2-}$c "
+			if [[ --no == "$cur_"* ]]; then
+				COMPREPLY[i++]="--no-... "
 			fi
 			break
 		fi

[v2,13/26] completion: bash: simplify __gitcomp

Commit Message

Patch