@matheusbsbs / matheus-bagliano / commits / 30bd55f901

completion: add space after config variable names also in Bash 3

In be6444d1ca (completion: bash: add correct suffix in variables, 2021-08-16), __git_complete_config_variable_name was changed to use "${sfx- }" instead of "$sfx" as the fourth argument of _gitcomp_nl and _gitcomp_nl_append, such that this argument evaluates to a space if sfx is unset. This was to ensure that e.g. git config branch.autoSetupMe[TAB] correctly completes to 'branch.autoSetupMerge ' with the trailing space. This commits notes that the fix only works in Bash 4 because in Bash 3 the 'local sfx' construct at the beginning of __git_complete_config_variable_name creates an empty string. Make the fix also work for Bash 3 by using the "unset or null' parameter expansion syntax ("${sfx:- }"), such that the parameter is also expanded to a space if it is set but null, as is the behaviour of 'local sfx' in Bash 3. Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Philippe Blain committed Feb 10, 2024 at 18:32 UTC 30bd55f901c97c310e674c051f00920f38a66ee0

1 file changed +3 -3

contrib/completion/git-completion.bash

+3 -3

@@ -2750,7 +2750,7 @@ __git_complete_config_variable_name ()

2750 local pfx="${cur_%.*}."

2751 cur_="${cur_#*.}"

2752 __gitcomp_direct "$(__git_heads "$pfx" "$cur_" ".")"

2753 - __gitcomp_nl_append $'autoSetupMerge\nautoSetupRebase\n' "$pfx" "$cur_" "${sfx- }"

2753 + __gitcomp_nl_append $'autoSetupMerge\nautoSetupRebase\n' "$pfx" "$cur_" "${sfx:- }"

2754 return

2755 ;;

2756 guitool.*.*)

@@ -2784,7 +2784,7 @@ __git_complete_config_variable_name ()

2784 local pfx="${cur_%.*}."

2785 cur_="${cur_#*.}"

2786 __git_compute_all_commands

2787 - __gitcomp_nl "$__git_all_commands" "$pfx" "$cur_" "${sfx- }"

2787 + __gitcomp_nl "$__git_all_commands" "$pfx" "$cur_" "${sfx:- }"

2788 return

2789 ;;

2790 remote.*.*)

@@ -2800,7 +2800,7 @@ __git_complete_config_variable_name ()

2800 local pfx="${cur_%.*}."

2801 cur_="${cur_#*.}"

2802 __gitcomp_nl "$(__git_remotes)" "$pfx" "$cur_" "."

2803 - __gitcomp_nl_append "pushDefault" "$pfx" "$cur_" "${sfx- }"

2803 + __gitcomp_nl_append "pushDefault" "$pfx" "$cur_" "${sfx:- }"

2804 return

2805 ;;

2806 url.*.*)