summary refs log tree commit diff
diff options
context:
space:
mode:
authorNikolai Weibull <pcppopper@users.sourceforge.net>2011-07-21 09:15:41 +0000
committerNikolai Weibull <pcppopper@users.sourceforge.net>2011-07-21 09:15:41 +0000
commitd37eda52f30cc50aa1908ca0a7abc99719a63d50 (patch)
tree24607a621005e2feee6a61461e833ee434caf36b
parente3c1917345abff3fd27e862795e2dbd0ef82b166 (diff)
downloadzsh-d37eda52f30cc50aa1908ca0a7abc99719a63d50.tar.gz
zsh-d37eda52f30cc50aa1908ca0a7abc99719a63d50.tar.xz
zsh-d37eda52f30cc50aa1908ca0a7abc99719a63d50.zip
unposted: Completion/Unix/Command/_git: Fix bug in git-add completion that
prevented -f option from being used correctly.
-rw-r--r--ChangeLog5
-rw-r--r--Completion/Unix/Command/_git2
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 7498e80d4..2e02bbab6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,9 @@
 	* unposted: Completion/Unix/Command/_git: Move _gitk and _tig to
 	correct location.
 
+	* unposted: Completion/Unix/Command/_git: Fix bug in git-add completion
+	that prevented -f option from being used correctly.
+
 2011-07-19  Peter Stephenson  <pws@csr.com>
 
 	* 29555: Src/exec.c: fix problem that shell failed to use file
@@ -15128,5 +15131,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.5400 $
+* $Revision: 1.5401 $
 *****************************************************
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index b4fcf07d5..b41cb4b19 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -63,7 +63,7 @@ _git-add () {
     (file)
       # TODO: Use __git_ignore_line_inside_arguments.
       declare -a ignored_files_alternatives
-      if [[ -n ${line[(I)-f|--force]} ]]; then
+      if [[ -n ${opt_args[(I)-f|--force]} ]]; then
         ignored_files_alternatives=(
           'ignored-modified-files:ignored modified files:__git_modified_files --ignored'
           'ignored-other-files:ignored other files:__git_other_files --ignored')