git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v2 28/45] completion: improve __gitcomp suffix code

From
Felipe Contreras <felipe.contreras@gmail.com>
Date
Jun 18, 2021, 18:25 UTC
Message-ID
<20210618182518.697912-29-felipe.contreras@gmail.com>
In-Reply-To
<20210618182518.697912-1-felipe.contreras@gmail.com>
There's no point in adding a suffix after a suffix.

If a suffix is provided, we add it, if not, then the default heuristic is used.

There's no functional change since most callers don't specify a suffix, and the ones that do use an =, which by default doesn't add an additional suffix.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
 contrib/completion/git-completion.bash | 17 ++++++++++-------
 contrib/completion/git-completion.zsh  | 18 +++++++++++-------
 2 files changed, 21 insertions(+), 14 deletions(-)
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index e7308b212f..c246d664c3 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -334,7 +334,7 @@ __gitcomp ()
 		return
 	fi
 
-	local c i=0 IFS=$' \t\n'
+	local c i=0 IFS=$' \t\n' sfx
 	for c in $1; do
 		if [[ $c == "--" ]]; then
 			if [[ "$cur_" == --no-* ]]; then
@@ -347,12 +347,15 @@ __gitcomp ()
 			break
 		fi
 		if [[ $c == "$cur_"* ]]; then
-			c="$c${4-}"
-			case $c in
-			*=|*.) ;;
-			*) c="$c " ;;
-			esac
-			COMPREPLY[i++]="${2-}$c"
+			if [[ -z "${4+set}" ]]; then
+				case $c in
+				*=|*.) sfx="" ;;
+				*) sfx=" " ;;
+				esac
+			else
+				sfx="$4"
+			fi
+			COMPREPLY[i++]="${2-}$c$sfx"
 		fi
 	done
 }
diff --git a/contrib/completion/git-completion.zsh b/contrib/completion/git-completion.zsh
index 6008a73816..b81479c814 100644
--- a/contrib/completion/git-completion.zsh
+++ b/contrib/completion/git-completion.zsh
@@ -58,7 +58,7 @@ __gitcomp ()
 
 	[[ "$cur_" == *= ]] && return
 
-	local c IFS=$' \t\n'
+	local c IFS=$' \t\n' sfx
 	local -a array
 	for c in ${=1}; do
 		if [[ $c == "--" ]]; then
@@ -66,12 +66,16 @@ __gitcomp ()
 			array+=("--no-... ")
 			break
 		fi
-		c="$c${4-}"
-		case $c in
-		*=|*.) ;;
-		*) c="$c " ;;
-		esac
-		array+=("$c")
+
+		if [[ -z "${4+set}" ]]; then
+			case $c in
+			*=|*.) sfx="" ;;
+			*) sfx=" " ;;
+			esac
+		else
+			sfx="$4"
+		fi
+		array+=("$c$sfx")
 	done
 	compadd -Q -S '' -p "${2-}" -a -- array && _ret=0
 }

-- 
2.32.0
Previous: Felipe ContrerasNext: Felipe Contreras
Message 31 of 48 in “completion: git-completion 1.3.3 patches”
  1. 00/45 completion: git-completion 1.3.3 patchesFelipe Contreras, Jun 18, 2021
  2. 01/45 completion: fix __git_cmd_idx regressionFelipe Contreras, Jun 18, 2021
  3. completion: fix __git_cmd_idx regressionFelipe Contreras, Jun 18, 2021
  4. Felipe ContrerasJun 18, 2021
  5. 02/45 completion: bash: fix prefix detection in branch.*Felipe Contreras, Jun 18, 2021
  6. 03/45 completion: fix for suboptions with valueFelipe Contreras, Jun 18, 2021
  7. 04/45 completion: bash: fix for multiple dash commandsFelipe Contreras, Jun 18, 2021
  8. 05/45 completion: bash: add correct suffix in variablesFelipe Contreras, Jun 18, 2021
  9. 06/45 completion: zsh: add higher-priority locationFelipe Contreras, Jun 18, 2021
  10. 07/45 completion: zsh: trivial improvementFelipe Contreras, Jun 18, 2021
  11. 08/45 completion: bash: do not modify COMP_WORDBREAKSFelipe Contreras, Jun 18, 2021
  12. 09/45 test: completion: fix currently typed wordsFelipe Contreras, Jun 18, 2021
  13. 10/45 test: completion: switch __gitcomp_nl prefix testFelipe Contreras, Jun 18, 2021
  14. 11/45 test: completion: add run_func() helperFelipe Contreras, Jun 18, 2021
  15. 12/45 completion: bash: remove non-append functionalityFelipe Contreras, Jun 18, 2021
  16. 13/45 completion: bash: get rid of _append() functionsFelipe Contreras, Jun 18, 2021
  17. 14/45 completion: bash: get rid of any non-append codeFelipe Contreras, Jun 18, 2021
  18. 15/45 completion: zsh: fix options with argumentsFelipe Contreras, Jun 18, 2021
  19. 16/45 completion: zsh: expand --git-dir file argumentFelipe Contreras, Jun 18, 2021
  20. 17/45 completion: zsh: add support for general -C optsFelipe Contreras, Jun 18, 2021
  21. 18/45 completion: zsh: fix for undefined completionsFelipe Contreras, Jun 18, 2021
  22. 19/45 completion: zsh: add support for general -c optsFelipe Contreras, Jun 18, 2021
  23. 20/45 completion: zsh: fix extra space on foo=Felipe Contreras, Jun 18, 2021
  24. 22/45 completion: zsh: always set compsetFelipe Contreras, Jun 18, 2021
  25. 21/45 completion: zsh: add excluded optionsFelipe Contreras, Jun 18, 2021
  26. 23/45 completion: factor out check in __gitcompFelipe Contreras, Jun 18, 2021
  27. 24/45 completion: simplify equal suffix checkFelipe Contreras, Jun 18, 2021
  28. 25/45 completion: refactor __gitcompFelipe Contreras, Jun 18, 2021
  29. 26/45 completion: simplify __gitcompFelipe Contreras, Jun 18, 2021
  30. 27/45 completion: bash: change suffix check in __gitcompFelipe Contreras, Jun 18, 2021
  31. 28/45 completion: improve __gitcomp suffix codeFelipe Contreras, Jun 18, 2021
  32. 29/45 completion: bash: simplify config_variable_nameFelipe Contreras, Jun 18, 2021
  33. 30/45 test: completion: add missing testFelipe Contreras, Jun 18, 2021
  34. 31/45 completion: bash: improve __gitcomp descriptionFelipe Contreras, Jun 18, 2021
  35. 32/45 completion: add __gitcomp_optsFelipe Contreras, Jun 18, 2021
  36. 33/45 completion: bash: cleanup __gitcomp* invocationsFelipe Contreras, Jun 18, 2021
  37. 34/45 completion: bash: shuffle __gitcomp functionsFelipe Contreras, Jun 18, 2021
  38. 35/45 completion: zsh: simplify __gitcomp_directFelipe Contreras, Jun 18, 2021
  39. 36/45 completion: zsh: shuffle __gitcomp* functionsFelipe Contreras, Jun 18, 2021
  40. 37/45 completion: zsh: fix direct quotingFelipe Contreras, Jun 18, 2021
  41. 38/45 completion: zsh: add elements individually in __gitcomp_optsFelipe Contreras, Jun 18, 2021
  42. 39/45 completion: zsh: add __gitcompadd helperFelipe Contreras, Jun 18, 2021
  43. 40/45 completion: zsh: add correct removable suffixFelipe Contreras, Jun 18, 2021
  44. 42/45 completion: bash: refactor _get_comp_words_by_ref()Felipe Contreras, Jun 18, 2021
  45. 41/45 completion: bash: simplify _get_comp_words_by_ref()Felipe Contreras, Jun 18, 2021
  46. 43/45 completion: bash: cleanup _get_comp_words_by_ref()Felipe Contreras, Jun 18, 2021
  47. 44/45 completion: bash: trivial cleanupFelipe Contreras, Jun 18, 2021
  48. 45/45 completion: bash: rename _get_comp_words_by_ref()Felipe Contreras, Jun 18, 2021

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.