summary refs log tree commit diff
diff options
context:
space:
mode:
authorNikolai Weibull <pcppopper@users.sourceforge.net>2011-05-17 17:15:13 +0000
committerNikolai Weibull <pcppopper@users.sourceforge.net>2011-05-17 17:15:13 +0000
commit62444c9bfc9d36a9cee00507fe2a0b906097b148 (patch)
tree0d6b995f330f99264652e5f1ab1feb2234c2e05c
parentcfebfe68b58383886f4365899a78135136b3506d (diff)
downloadzsh-62444c9bfc9d36a9cee00507fe2a0b906097b148.tar.gz
zsh-62444c9bfc9d36a9cee00507fe2a0b906097b148.tar.xz
zsh-62444c9bfc9d36a9cee00507fe2a0b906097b148.zip
29273: Completion/Unix/Command/_git: Fix __git_guard_number
-rw-r--r--ChangeLog7
-rw-r--r--Completion/Unix/Command/_git4
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 985f2ad54..a8eea0611 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-17  Nikolai Weibull <now@bitwi.se>
+
+	* 29273: Completion/Unix/Command/_git: Parse compadd options in
+	__git_guard_number.
+
 2011-05-14  Barton E. Schaefer  <schaefer@zsh.org>
 
 	* 29278: Completion/Unix/Type/_path_files: fix use of the $skips
@@ -14717,5 +14722,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.5305 $
+* $Revision: 1.5306 $
 *****************************************************
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index ccff03fed..4b1770fad 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -5424,6 +5424,10 @@ __git_guard_diff-stat-width () {
 
 (( $+functions[__git_guard_number] )) ||
 __git_guard_number () {
+  declare -A opts
+
+  zparseopts -K -D -A opts M: J: V: 1 2 n F: X:
+
   _guard "[[:digit:]]#" ${1:-number}
 }