Skip to content

Commit f45db83

Browse files
pcloudsgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent e17ca92 commit f45db83

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

contrib/completion/git-completion.bash

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2093,20 +2093,20 @@ _git_config ()
20932093
;;
20942094
branch.*.*)
20952095
local pfx="${cur%.*}." cur_="${cur##*.}"
2096-
__gitcomp "remote pushremote merge mergeoptions rebase" "$pfx" "$cur_"
2096+
__gitcomp "remote pushRemote merge mergeOptions rebase" "$pfx" "$cur_"
20972097
return
20982098
;;
20992099
branch.*)
21002100
local pfx="${cur%.*}." cur_="${cur#*.}"
21012101
__gitcomp_direct "$(__git_heads "$pfx" "$cur_" ".")"
2102-
__gitcomp_nl_append $'autosetupmerge\nautosetuprebase\n' "$pfx" "$cur_"
2102+
__gitcomp_nl_append $'autoSetupMerge\nautoSetupRebase\n' "$pfx" "$cur_"
21032103
return
21042104
;;
21052105
guitool.*.*)
21062106
local pfx="${cur%.*}." cur_="${cur##*.}"
21072107
__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
21102110
" "$pfx" "$cur_"
21112111
return
21122112
;;
@@ -2135,14 +2135,14 @@ _git_config ()
21352135
local pfx="${cur%.*}." cur_="${cur##*.}"
21362136
__gitcomp "
21372137
url proxy fetch push mirror skipDefaultUpdate
2138-
receivepack uploadpack tagopt pushurl
2138+
receivepack uploadpack tagOpt pushurl
21392139
" "$pfx" "$cur_"
21402140
return
21412141
;;
21422142
remote.*)
21432143
local pfx="${cur%.*}." cur_="${cur#*.}"
21442144
__gitcomp_nl "$(__git_remotes)" "$pfx" "$cur_" "."
2145-
__gitcomp_nl_append "pushdefault" "$pfx" "$cur_"
2145+
__gitcomp_nl_append "pushDefault" "$pfx" "$cur_"
21462146
return
21472147
;;
21482148
url.*.*)

0 commit comments

Comments
 (0)