mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-02 22:11:54 +02:00
Code Releases Activity

46131: _git-config: Partly fix a bug whereby a 'foo.ba<TAB>' wouldn't be completed to 'foo.bar.baz'.

Browse source 
Now it properly gets completed, but in the case of gpg.openpgp.program,
the description would be shown as "unknown option name", that being the
description of gpg.*.program via `git help -c`, which shadows the
more description of gpg.openpgp.program in $git_options.
This commit is contained in:
Daniel Shahaf 2020-06-26 18:06:42 +00:00
parent 1776422438
commit a4b4a3a7c7
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,5 +1,9 @@
2020-06-28 Daniel Shahaf <d.s@daniel.shahaf.name> 2020-06-28 Daniel Shahaf <d.s@daniel.shahaf.name>
* 46131: Completion/Unix/Command/_git: _git-config: Partly
fix a bug whereby a 'foo.ba<TAB>' wouldn't be completed to
'foo.bar.baz'.
* 46128: Completion/Unix/Command/_git: Complete more options * 46128: Completion/Unix/Command/_git: Complete more options
and diff/merge tools. and diff/merge tools.

5
Completion/Unix/Command/_git
View file

@ -2963,6 +2963,7 @@ __git_config_option-or-value () {
pretty pretty
remotes remotes
${(u)${(M)${git_options%%:*}:#*[.][*][.]*}%%.*} ${(u)${(M)${git_options%%:*}:#*[.][*][.]*}%%.*}
${(u)${(M)git_present_options:#*[.][*][.]*}%%.*}
) )
local key local key
for key in $git_present_options ; do for key in $git_present_options ; do
@ -3008,6 +3009,7 @@ __git_config_option-or-value () {
if compset -P '[^.]##.*.'; then if compset -P '[^.]##.*.'; then
declare -a match mbegin mend declare -a match mbegin mend
# TODO: completing 'gpg.openpgp<TAB>' adds both 'gpg.openpgp.program' and 'gpg.*.program' to $options, so it ends up being listed as 'unknown option name' even though we have a description
# When completing 'remote.foo.<TAB>', offer 'bar' if $git_options contains 'remote.foo.bar'. # When completing 'remote.foo.<TAB>', offer 'bar' if $git_options contains 'remote.foo.bar'.
options+=(${${${${(M)git_options:#(#i)${IPREFIX}[^.:]##:*}#(#i)${IPREFIX}}/#(#b)([^:]##:)([^\\:]#(\\?[^\\:]#)#:[^\\:]#(\\?[^\\:]#)#:->bool)/$match[1]whether or not to $match[2]}/#(#b)([^:]##:([^\\:]#(\\?[^\\:]#)#))*/$match[1]}) options+=(${${${${(M)git_options:#(#i)${IPREFIX}[^.:]##:*}#(#i)${IPREFIX}}/#(#b)([^:]##:)([^\\:]#(\\?[^\\:]#)#:[^\\:]#(\\?[^\\:]#)#:->bool)/$match[1]whether or not to $match[2]}/#(#b)([^:]##:([^\\:]#(\\?[^\\:]#)#))*/$match[1]})
# When completing 'remote.foo.<TAB>', offer 'bar' if $git_options contains 'remote.*.bar'. # When completing 'remote.foo.<TAB>', offer 'bar' if $git_options contains 'remote.*.bar'.
@ -3045,8 +3047,7 @@ __git_config_option-or-value () {
elif compset -P '[^.]##.'; then elif compset -P '[^.]##.'; then
local opt local opt
declare -a match mbegin mend declare -a match mbegin mend
# TODO: completing 'gpg.openpgp<TAB>' doesn't offer 'gpg.openpgp.program' for opt in ${${${${(M)git_options:#(#i)${IPREFIX}[^.:][^:]#:*}#(#i)${IPREFIX}}/#(#b)([^:]##:)([^\\:]#(\\?[^\\:]#)#:[^\\:]#(\\?[^\\:]#)#:->bool)/$match[1]whether or not to $match[2]}/#(#b)([^:]##:([^\\:]#(\\?[^\\:]#)#))*/$match[1]}; do
for opt in ${${${${(M)git_options:#(#i)${IPREFIX}[^.:]##:*}#(#i)${IPREFIX}}/#(#b)([^:]##:)([^\\:]#(\\?[^\\:]#)#:[^\\:]#(\\?[^\\:]#)#:->bool)/$match[1]whether or not to $match[2]}/#(#b)([^:]##:([^\\:]#(\\?[^\\:]#)#))*/$match[1]}; do
if (( ${git_options[(I)${IPREFIX}${opt%%:*}.*]} )); then if (( ${git_options[(I)${IPREFIX}${opt%%:*}.*]} )); then
sections_and_options+=$opt sections_and_options+=$opt
else else