Some __gitcomp calls should be __gitcomp_nl, and vice versa.
No functional changes.
Signed-off-by: Felipe Contreras <felipe.contreras@xxxxxxxxx>
---
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
