[PATCH v7 37/49] completion: bash: cleanup __gitcomp* invocations

git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed

From: Felipe Contreras <felipe.contreras@gmail.com>
To: git@vger.kernel.org
Cc: Felipe Contreras <felipe.contreras@gmail.com>
Subject: [PATCH v7 37/49] completion: bash: cleanup __gitcomp* invocations
Date: Sat,  1 Apr 2023 02:46:14 -0600	[thread overview]
Message-ID: <20230401084626.304356-38-felipe.contreras@gmail.com> (raw)
In-Reply-To: <20230401084626.304356-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 ba225e999a..bc6f83adce 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1394,7 +1394,7 @@ _git_archive ()
 {
 	case "$cur" in
 	--format=*)
-		__gitcomp "$(git archive --list)" "" "${cur##--format=}"
+		__gitcomp_nl "$(git archive --list)" "" "${cur##--format=}"
 		return
 		;;
 	--remote=*)
@@ -1808,9 +1808,7 @@ _git_format_patch ()
 {
 	case "$cur" in
 	--thread=*)
-		__gitcomp "
-			deep shallow
-			" "" "${cur##--thread=}"
+		__gitcomp "deep shallow" "" "${cur##--thread=}"
 		return
 		;;
 	--base=*|--interdiff=*|--range-diff=*)
@@ -2316,7 +2314,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
@@ -2340,9 +2338,7 @@ _git_send_email ()
 		return
 		;;
 	--thread=*)
-		__gitcomp "
-			deep shallow
-			" "" "${cur##--thread=}"
+		__gitcomp "deep shallow" "" "${cur##--thread=}"
 		return
 		;;
 	--to=*|--cc=*|--bcc=*|--from=*)
@@ -2642,7 +2638,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.*.*)
@@ -2692,7 +2688,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.*.*)
@@ -2707,7 +2703,7 @@ __git_complete_config_variable_name ()
 		;;
 	*)
 		__git_compute_config_sections
-		__gitcomp "$__git_config_sections" "" "$cur_" "."
+		__gitcomp_nl "$__git_config_sections" "" "$cur_" "."
 		;;
 	esac
 }
@@ -2801,7 +2797,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
@@ -3484,7 +3480,7 @@ __git_main ()
 				then
 					list_cmds=builtins,$list_cmds
 				fi
-				__gitcomp "$(__git --list-cmds=$list_cmds)"
+				__gitcomp_nl "$(__git --list-cmds=$list_cmds)"
 			fi
 			;;
 		esac
-- 
2.33.0

next prev parent reply	other threads:[~2023-04-01  8:49 UTC|newest]

Thread overview: 50+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-04-01  8:45 [PATCH v7 00/49] completion: git-completion 2.0 patches Felipe Contreras
2023-04-01  8:45 ` [PATCH v7 01/49] test: completion add test for __git_cmd_idx Felipe Contreras
2023-04-01  8:45 ` [PATCH v7 02/49] completion: bash: trivial cleanup Felipe Contreras
2023-04-01  8:45 ` [PATCH v7 03/49] zsh: remove version Felipe Contreras
2023-04-01  8:45 ` [PATCH v7 04/49] completion: bash: trivial grammar fix Felipe Contreras
2023-04-01  8:45 ` [PATCH v7 05/49] completion: zsh: add higher-priority location Felipe Contreras
2023-04-01  8:45 ` [PATCH v7 06/49] zsh: resolve symlink of script Felipe Contreras
2023-04-01  8:45 ` [PATCH v7 07/49] zsh: simplify realpath dirname idiom Felipe Contreras
2023-04-01  8:45 ` [PATCH v7 08/49] test: completion: use global config Felipe Contreras
2023-04-01  8:45 ` [PATCH v7 09/49] completion: fix __git_cmd_idx regression for zsh Felipe Contreras
2023-04-01  8:45 ` [PATCH v7 10/49] completion: fix for suboptions with value Felipe Contreras
2023-04-01  8:45 ` [PATCH v7 11/49] completion: zsh: trivial improvement Felipe Contreras
2023-04-01  8:45 ` [PATCH v7 12/49] completion: bash: do not modify COMP_WORDBREAKS Felipe Contreras
2023-04-01  8:45 ` [PATCH v7 13/49] test: completion: fix currently typed words Felipe Contreras
2023-04-01  8:45 ` [PATCH v7 14/49] test: completion: switch __gitcomp_nl prefix test Felipe Contreras
2023-04-01  8:45 ` [PATCH v7 15/49] test: completion: add run_func() helper Felipe Contreras
2023-04-01  8:45 ` [PATCH v7 16/49] completion: bash: remove non-append functionality Felipe Contreras
2023-04-01  8:45 ` [PATCH v7 17/49] completion: bash: get rid of _append() functions Felipe Contreras
2023-04-01  8:45 ` [PATCH v7 18/49] completion: bash: get rid of any non-append code Felipe Contreras
2023-04-01  8:45 ` [PATCH v7 19/49] completion: zsh: fix options with arguments Felipe Contreras
2023-04-01  8:45 ` [PATCH v7 20/49] completion: zsh: expand --git-dir file argument Felipe Contreras
2023-04-01  8:45 ` [PATCH v7 21/49] completion: zsh: add support for general -C opts Felipe Contreras
2023-04-01  8:45 ` [PATCH v7 22/49] completion: zsh: fix for undefined completions Felipe Contreras
2023-04-01  8:46 ` [PATCH v7 23/49] completion: zsh: add support for general -c opts Felipe Contreras
2023-04-01  8:46 ` [PATCH v7 24/49] completion: zsh: fix extra space on foo= Felipe Contreras
2023-04-01  8:46 ` [PATCH v7 25/49] completion: zsh: add excluded options Felipe Contreras
2023-04-01  8:46 ` [PATCH v7 26/49] completion: zsh: always set compset Felipe Contreras
2023-04-01  8:46 ` [PATCH v7 27/49] completion: factor out check in __gitcomp Felipe Contreras
2023-04-01  8:46 ` [PATCH v7 28/49] completion: simplify equal suffix check Felipe Contreras
2023-04-01  8:46 ` [PATCH v7 29/49] completion: refactor __gitcomp Felipe Contreras
2023-04-01  8:46 ` [PATCH v7 30/49] completion: simplify __gitcomp Felipe Contreras
2023-04-01  8:46 ` [PATCH v7 31/49] completion: bash: change suffix check in __gitcomp Felipe Contreras
2023-04-01  8:46 ` [PATCH v7 32/49] completion: improve __gitcomp suffix code Felipe Contreras
2023-04-01  8:46 ` [PATCH v7 33/49] test: completion: add missing test Felipe Contreras
2023-04-01  8:46 ` [PATCH v7 34/49] completion: bash: simplify config_variable_name Felipe Contreras
2023-04-01  8:46 ` [PATCH v7 35/49] completion: bash: improve __gitcomp description Felipe Contreras
2023-04-01  8:46 ` [PATCH v7 36/49] completion: add __gitcomp_opts Felipe Contreras
2023-04-01  8:46 ` Felipe Contreras [this message]
2023-04-01  8:46 ` [PATCH v7 38/49] completion: bash: shuffle __gitcomp functions Felipe Contreras
2023-04-01  8:46 ` [PATCH v7 39/49] completion: zsh: simplify __gitcomp_direct Felipe Contreras
2023-04-01  8:46 ` [PATCH v7 40/49] completion: zsh: shuffle __gitcomp* functions Felipe Contreras
2023-04-01  8:46 ` [PATCH v7 41/49] completion: zsh: fix direct quoting Felipe Contreras
2023-04-01  8:46 ` [PATCH v7 42/49] completion: zsh: add elements individually in __gitcomp_opts Felipe Contreras
2023-04-01  8:46 ` [PATCH v7 43/49] completion: zsh: add __gitcompadd helper Felipe Contreras
2023-04-01  8:46 ` [PATCH v7 44/49] completion: zsh: add correct removable suffix Felipe Contreras
2023-04-01  8:46 ` [PATCH v7 45/49] completion: bash: simplify _get_comp_words_by_ref() Felipe Contreras
2023-04-01  8:46 ` [PATCH v7 46/49] completion: bash: refactor _get_comp_words_by_ref() Felipe Contreras
2023-04-01  8:46 ` [PATCH v7 47/49] completion: bash: cleanup _get_comp_words_by_ref() Felipe Contreras
2023-04-01  8:46 ` [PATCH v7 48/49] completion: bash: trivial cleanup Felipe Contreras
2023-04-01  8:46 ` [PATCH v7 49/49] completion: bash: rename _get_comp_words_by_ref() Felipe Contreras

find likely ancestor, descendant, or conflicting patches for this message:
dfblob:ba225e999 dfblob:bc6f83adc
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230401084626.304356-38-felipe.contreras@gmail.com \
    --to=felipe.contreras@gmail.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).