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

[PATCH v2 02/26] completion: bash: add correct suffix in variables

From
Felipe Contreras <felipe.contreras@gmail.com>
Date
Nov 10, 2020, 21:21 UTC
Message-ID
<20201110212136.870769-3-felipe.contreras@gmail.com>
In-Reply-To
<20201110212136.870769-1-felipe.contreras@gmail.com>

__gitcomp automatically adds a suffix, but __gitcomp_nl and others don't, we need to specify a space by default.

Can be tested with:
  git config branch.autoSetupMe<tab>
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
 contrib/completion/git-completion.bash | 6 +++---
 t/t9902-completion.sh                  | 7 +++++++
 2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index b866b68b3c..bbdb46d87e 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -2618,7 +2618,7 @@ __git_complete_config_variable_name ()
 		local pfx="${cur_%.*}."
 		cur_="${cur_#*.}"
 		__gitcomp_direct "$(__git_heads "$pfx" "$cur_" ".")"
-		__gitcomp_nl_append $'autoSetupMerge\nautoSetupRebase\n' "$pfx" "$cur_" "$sfx"
+		__gitcomp_nl_append $'autoSetupMerge\nautoSetupRebase\n' "$pfx" "$cur_" "${sfx- }"
 		return
 		;;
 	guitool.*.*)
@@ -2652,7 +2652,7 @@ __git_complete_config_variable_name ()
 		local pfx="${cur_%.*}."
 		cur_="${cur_#*.}"
 		__git_compute_all_commands
-		__gitcomp_nl "$__git_all_commands" "$pfx" "$cur_" "$sfx"
+		__gitcomp_nl "$__git_all_commands" "$pfx" "$cur_" "${sfx- }"
 		return
 		;;
 	remote.*.*)
@@ -2668,7 +2668,7 @@ __git_complete_config_variable_name ()
 		local pfx="${cur_%.*}."
 		cur_="${cur_#*.}"
 		__gitcomp_nl "$(__git_remotes)" "$pfx" "$cur_" "."
-		__gitcomp_nl_append "pushDefault" "$pfx" "$cur_" "$sfx"
+		__gitcomp_nl_append "pushDefault" "$pfx" "$cur_" "${sfx- }"
 		return
 		;;
 	url.*.*)
diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh
index 2be9190425..4a3d3d1597 100755
--- a/t/t9902-completion.sh
+++ b/t/t9902-completion.sh
@@ -2293,6 +2293,13 @@ test_expect_success 'git config - value' '
 	EOF
 '
 
+test_expect_success 'git config - direct completions' '
+	test_completion "git config branch.autoSetup" <<-\EOF
+	branch.autoSetupMerge Z
+	branch.autoSetupRebase Z
+	EOF
+'
+
 test_expect_success 'git -c - section' '
 	test_completion "git -c br" <<-\EOF
 	branch.Z

-- 
2.29.2
Previous: Felipe ContrerasNext: Felipe Contreras
Message 6 of 36 in “completion: bash: a bunch of fixes, cleanups, and reorganization”
  1. 00/26 completion: bash: a bunch of fixes, cleanups, and reorganizationFelipe Contreras, Nov 10, 2020
  2. 01/26 completion: bash: fix prefix detection in branch.*Felipe Contreras, Nov 10, 2020
  3. SZEDER GáborNov 25, 2020
  4. Junio C HamanoNov 25, 2020
  5. Felipe ContrerasNov 25, 2020
  6. 02/26 completion: bash: add correct suffix in variablesFelipe Contreras, Nov 10, 2020
  7. 03/26 completion: bash: fix for suboptions with valueFelipe Contreras, Nov 10, 2020
  8. 04/26 completion: bash: do not modify COMP_WORDBREAKSFelipe Contreras, Nov 10, 2020
  9. 05/26 test: completion: fix currently typed wordsFelipe Contreras, Nov 10, 2020
  10. 06/26 test: completion: add run_func() helperFelipe Contreras, Nov 10, 2020
  11. Junio C HamanoNov 11, 2020
  12. Felipe ContrerasNov 11, 2020
  13. Junio C HamanoNov 11, 2020
  14. Felipe ContrerasNov 12, 2020
  15. 07/26 completion: bash: remove non-append functionalityFelipe Contreras, Nov 10, 2020
  16. 08/26 completion: bash: get rid of _append() functionsFelipe Contreras, Nov 10, 2020
  17. 10/26 completion: bash: factor out check in __gitcompFelipe Contreras, Nov 10, 2020
  18. 09/26 completion: bash: get rid of any non-append codeFelipe Contreras, Nov 10, 2020
  19. 11/26 completion: bash: simplify equal suffix checkFelipe Contreras, Nov 10, 2020
  20. 12/26 completion: bash: refactor __gitcompFelipe Contreras, Nov 10, 2020
  21. Junio C HamanoNov 12, 2020
  22. Felipe ContrerasNov 12, 2020
  23. 13/26 completion: bash: simplify __gitcompFelipe Contreras, Nov 10, 2020
  24. 15/26 completion: bash: improve __gitcomp suffix codeFelipe Contreras, Nov 10, 2020
  25. 14/26 completion: bash: change suffix check in __gitcompFelipe Contreras, Nov 10, 2020
  26. 16/26 completion: bash: simplify config_variable_nameFelipe Contreras, Nov 10, 2020
  27. 17/26 test: completion: switch __gitcomp_nl prefix testFelipe Contreras, Nov 10, 2020
  28. 18/26 completion: bash: simplify _get_comp_words_by_ref()Felipe Contreras, Nov 10, 2020
  29. 19/26 completion: bash: refactor _get_comp_words_by_ref()Felipe Contreras, Nov 10, 2020
  30. 20/26 completion: bash: cleanup _get_comp_words_by_ref()Felipe Contreras, Nov 10, 2020
  31. 21/26 completion: bash: trivial cleanupFelipe Contreras, Nov 10, 2020
  32. 22/26 completion: bash: rename _get_comp_words_by_ref()Felipe Contreras, Nov 10, 2020
  33. 23/26 completion: bash: improve __gitcomp descriptionFelipe Contreras, Nov 10, 2020
  34. 24/26 completion: bash: add __gitcomp_optsFelipe Contreras, Nov 10, 2020
  35. 25/26 completion: bash: cleanup __gitcomp* invocationsFelipe Contreras, Nov 10, 2020
  36. 26/26 completion: bash: shuffle __gitcomp functionsFelipe Contreras, Nov 10, 2020

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.