completion: keep other config var completion in camelCase
The last patch makes "git config <tab>" shows camelCase names because that's what's in the source: config.txt. There are still a couple manual var completion in this code. Let's make them follow the naming convention as well. In theory we could automate this part too because we have the information. But let's stick to one step at a time and leave this for later. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Nguyễn Thái Ngọc Duy committed
May 26, 2018 at 15:55 UTC
f45db831c17d0a32d2e1cd0f5ac40708020bcf8f
1 file changed
+6
-6
contrib/completion/git-completion.bash
+6
-6
@@ -2093,20 +2093,20 @@ _git_config ()
2093
;;
2094
branch.*.*)
2095
local pfx="${cur%.*}." cur_="${cur##*.}"
2096
- __gitcomp "remote pushremote merge mergeoptions rebase" "$pfx" "$cur_"
2096
+ __gitcomp "remote pushRemote merge mergeOptions rebase" "$pfx" "$cur_"
2097
return
2098
;;
2099
branch.*)
2100
local pfx="${cur%.*}." cur_="${cur#*.}"
2101
__gitcomp_direct "$(__git_heads "$pfx" "$cur_" ".")"
2102
- __gitcomp_nl_append $'autosetupmerge\nautosetuprebase\n' "$pfx" "$cur_"
2102
+ __gitcomp_nl_append $'autoSetupMerge\nautoSetupRebase\n' "$pfx" "$cur_"
2103
return
2104
;;
2105
guitool.*.*)
2106
local pfx="${cur%.*}." cur_="${cur##*.}"
2107
__gitcomp "
2108
- argprompt cmd confirm needsfile noconsole norescan
2109
- prompt revprompt revunmerged title
2108
+ argPrompt cmd confirm needsFile noConsole noRescan
2109
+ prompt revPrompt revUnmerged title
2110
" "$pfx" "$cur_"
2111
return
2112
;;
@@ -2135,14 +2135,14 @@ _git_config ()
2135
local pfx="${cur%.*}." cur_="${cur##*.}"
2136
__gitcomp "
2137
url proxy fetch push mirror skipDefaultUpdate
2138
- receivepack uploadpack tagopt pushurl
2138
+ receivepack uploadpack tagOpt pushurl
2139
" "$pfx" "$cur_"
2140
return
2141
;;
2142
remote.*)
2143
local pfx="${cur%.*}." cur_="${cur#*.}"
2144
__gitcomp_nl "$(__git_remotes)" "$pfx" "$cur_" "."
2145
- __gitcomp_nl_append "pushdefault" "$pfx" "$cur_"
2145
+ __gitcomp_nl_append "pushDefault" "$pfx" "$cur_"
2146
return
2147
;;
2148
url.*.*)