diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | Completion/Unix/Command/_git | 8 |
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 9eaa936b5..9b9dcaa0d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2016-08-01 Daniel Shahaf <d.s@daniel.shahaf.name> + * 38963: Completion/Unix/Command/_git: _git-config: Run + gettable-options earlier and in all codepaths. + * 38961: Completion/Unix/Command/_git: _git-config: No functional change: rename $git_options_static to $git_options in preparation for the after-next commit. diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git index b23076a1a..30af6bc07 100644 --- a/Completion/Unix/Command/_git +++ b/Completion/Unix/Command/_git @@ -2454,6 +2454,11 @@ _git-config () { user.signingkey:'default GPG key to use when creating signed tags::__git_gpg_secret_keys' web.browser:'web browser to use::__git_browsers') + declare -a git_present_options # 'present' is an adjective + git_present_options=( + ${${${(0)"$(_call_program gettable-options git config -z --list)"}%%$'\n'*}//:/\\:} + ) + case $state in (section) __git_config_sections -b '(|)' '^' section-names 'section name' $* && ret=0 @@ -2663,8 +2668,7 @@ _git-config () { options -M 'm:{[:lower:][:upper:]}={[:upper:][:lower:]}' && ret=0 ;; (gettable-option) - _wanted git-options expl option compadd -M 'r:|.=* r:|=*' - \ - ${${${(0)"$(_call_program gettable-options git config -z --list)"}%%$'\n'*}//:/\\:} && ret=0 + _wanted git-options expl option compadd -M 'r:|.=* r:|=*' -a - git_present_options && ret=0 ;; (gettable-colorbool-option) __git_config_sections -b '(|)' -a '(|)' '^color\.[^.]+$' gettable-colorbool-options option && ret=0 |