about summary refs log tree commit diff
diff options
context:
space:
mode:
authorOliver Kiddle <opk@zsh.org>2015-05-15 18:04:40 +0200
committerOliver Kiddle <opk@zsh.org>2015-05-15 18:04:40 +0200
commit32a448dc25246ab3400f2459ba2648912c477137 (patch)
treee89d86dd07b36cc146e01196214582cc855590e9
parent153a99de7ef473df11df2b34388c75bec2b99b36 (diff)
downloadzsh-32a448dc25246ab3400f2459ba2648912c477137.tar.gz
zsh-32a448dc25246ab3400f2459ba2648912c477137.tar.xz
zsh-32a448dc25246ab3400f2459ba2648912c477137.zip
users/20219: fix completion for git options
-rw-r--r--ChangeLog4
-rw-r--r--Completion/Unix/Command/_git4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 7acaa6f1c..98b419eca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-05-15  Oliver Kiddle  <opk@zsh.org>
+
+	* users/20219: Completion/Unix/Command/_git: fix for git options
+
 2015-05-15  Peter Stephenson  <p.stephenson@samsung.com>
 
 	* 35154: NEWS: news on arithmetic evaluation changes.
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index c13ec127a..4876534a5 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -1793,7 +1793,7 @@ _tig () {
 (( $+functions[_git-config] )) ||
 _git-config () {
   local name_arg value_arg
-  local curcontext=$curcontext state line ret=1
+  local curcontext=$curcontext state line expl ret=1
   declare -A opt_args
 
   if (( words[(I)--get-regexp] )); then
@@ -2553,7 +2553,7 @@ _git-config () {
         options -M 'm:{[:lower:][:upper:]}={[:upper:][:lower:]}' && ret=0
       ;;
     (gettable-option)
-      _describe -t git-options option \
+      _wanted git-options expl option compadd -M 'r:|.=* r:|=*' - \
         ${${${(0)"$(_call_program gettable-options git config -z --list)"}%%$'\n'*}//:/\\:} && ret=0
       ;;
     (gettable-colorbool-option)