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

[PATCH v2 33/45] completion: bash: cleanup __gitcomp* invocations

From
Felipe Contreras <felipe.contreras@gmail.com>
Date
Jun 18, 2021, 18:25 UTC
Message-ID
<20210618182518.697912-34-felipe.contreras@gmail.com>
In-Reply-To
<20210618182518.697912-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 8836eab884..7a27347d56 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1369,7 +1369,7 @@ _git_archive ()
 {
 	case "$cur" in
 	--format=*)
-		__gitcomp "$(git archive --list)" "" "${cur##--format=}"
+		__gitcomp_nl "$(git archive --list)" "" "${cur##--format=}"
 		return
 		;;
 	--remote=*)
@@ -1782,9 +1782,7 @@ _git_format_patch ()
 {
 	case "$cur" in
 	--thread=*)
-		__gitcomp "
-			deep shallow
-			" "" "${cur##--thread=}"
+		__gitcomp "deep shallow" "" "${cur##--thread=}"
 		return
 		;;
 	--base=*|--interdiff=*|--range-diff=*)
@@ -2290,7 +2288,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
@@ -2314,9 +2312,7 @@ _git_send_email ()
 		return
 		;;
 	--thread=*)
-		__gitcomp "
-			deep shallow
-			" "" "${cur##--thread=}"
+		__gitcomp "deep shallow" "" "${cur##--thread=}"
 		return
 		;;
 	--to=*|--cc=*|--bcc=*|--from=*)
@@ -2618,7 +2614,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.*.*)
@@ -2668,7 +2664,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.*.*)
@@ -2683,7 +2679,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
 				}
@@ -2785,7 +2781,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
@@ -3430,7 +3426,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.32.0
Previous: Felipe ContrerasNext: Felipe Contreras
Message 36 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.