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

[PATCH v1 30/43] completion: bash: cleanup __gitcomp* invocations

From
Felipe Contreras <felipe.contreras@gmail.com>
Date
Apr 26, 2021, 16:14 UTC
Message-ID
<20210426161458.49860-31-felipe.contreras@gmail.com>
In-Reply-To
<20210426161458.49860-1-felipe.contreras@gmail.com>
Some __gitcomp calls should be __gitcomp_nl, and vice versa.
No functional changes.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
 contrib/completion/git-completion.bash | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 00fd782e57..44cf70daa4 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1364,7 +1364,7 @@ _git_archive ()
 {
 	case "$cur" in
 	--format=*)
-		__gitcomp "$(git archive --list)" "" "${cur##--format=}"
+		__gitcomp_nl "$(git archive --list)" "" "${cur##--format=}"
 		return
 		;;
 	--remote=*)
@@ -1777,9 +1777,7 @@ _git_format_patch ()
 {
 	case "$cur" in
 	--thread=*)
-		__gitcomp "
-			deep shallow
-			" "" "${cur##--thread=}"
+		__gitcomp "deep shallow" "" "${cur##--thread=}"
 		return
 		;;
 	--base=*|--interdiff=*|--range-diff=*)
@@ -2285,7 +2283,7 @@ _git_send_email ()
 {
 	case "$prev" in
 	--to|--cc|--bcc|--from)
-		__gitcomp "$(__git send-email --dump-aliases)"
+		__gitcomp_nl "$(__git send-email --dump-aliases)"
 		return
 		;;
 	esac
@@ -2309,9 +2307,7 @@ _git_send_email ()
 		return
 		;;
 	--thread=*)
-		__gitcomp "
-			deep shallow
-			" "" "${cur##--thread=}"
+		__gitcomp "deep shallow" "" "${cur##--thread=}"
 		return
 		;;
 	--to=*|--cc=*|--bcc=*|--from=*)
@@ -2613,7 +2609,7 @@ __git_complete_config_variable_name ()
 		local pfx="${cur_%.*}."
 		cur_="${cur_#*.}"
 		__gitcomp_direct "$(__git_heads "$pfx" "$cur_" ".")"
-		__gitcomp_nl $'autoSetupMerge\nautoSetupRebase\n' "$pfx" "$cur_" "$sfx"
+		__gitcomp "autoSetupMerge autoSetupRebase" "$pfx" "$cur_" "$sfx"
 		return
 		;;
 	guitool.*.*)
@@ -2663,7 +2659,7 @@ __git_complete_config_variable_name ()
 		local pfx="${cur_%.*}."
 		cur_="${cur_#*.}"
 		__gitcomp_nl "$(__git_remotes)" "$pfx" "$cur_" "."
-		__gitcomp_nl "pushDefault" "$pfx" "$cur_" "$sfx"
+		__gitcomp "pushDefault" "$pfx" "$cur_" "$sfx"
 		return
 		;;
 	url.*.*)
@@ -2678,7 +2674,7 @@ __git_complete_config_variable_name ()
 		;;
 	*)
 		__git_compute_config_vars
-		__gitcomp "$(echo "$__git_config_vars" |
+		__gitcomp_nl "$(echo "$__git_config_vars" |
 				awk -F . '{
 					sections[$1] = 1
 				}
@@ -2780,7 +2776,7 @@ _git_remote ()
 		__gitcomp_builtin remote_update
 		;;
 	update,*)
-		__gitcomp "$(__git_remotes) $(__git_get_config_variables "remotes")"
+		__gitcomp_nl "$(__git_remotes) $(__git_get_config_variables "remotes")"
 		;;
 	set-url,--*)
 		__gitcomp_builtin remote_set-url
@@ -3422,7 +3418,7 @@ __git_main ()
 			then
 				__gitcomp "$GIT_TESTING_PORCELAIN_COMMAND_LIST"
 			else
-				__gitcomp "$(__git --list-cmds=list-mainporcelain,others,nohelpers,alias,list-complete,config)"
+				__gitcomp_nl "$(__git --list-cmds=list-mainporcelain,others,nohelpers,alias,list-complete,config)"
 			fi
 			;;
 		esac

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