From 3eb08466453403c6ac3f5f84405b91f1ed007bfb Mon Sep 17 00:00:00 2001
From: Nikolai Weibull <pcppopper@users.sourceforge.net>
Date: Thu, 21 Jul 2011 10:03:09 +0000
Subject: unposted: Completion/Unix/Command/_git: Update git-add completion to
 not complete already given file arguments and also to not list file
 completions if an option is being completed.

---
 Completion/Unix/Command/_git | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'Completion/Unix')

diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index b41cb4b19..2fdc4d61c 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -57,21 +57,20 @@ _git-add () {
     '--refresh[do not add files, but refresh their stat() info in index]' \
     '--ignore-errors[continue adding if an error occurs]' \
     $ignore_missing \
-    '*:: :->file' && ret=0
+    '*:: :->file' && return
 
   case $state in
     (file)
-      # TODO: Use __git_ignore_line_inside_arguments.
       declare -a ignored_files_alternatives
       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')
+          'ignored-modified-files:ignored modified files:__git_ignore_line_inside_arguments __git_modified_files --ignored'
+          'ignored-other-files:ignored other files:__git_ignore_line_inside_arguments __git_other_files --ignored')
       fi
 
       _alternative \
-        'modified-files::__git_modified_files' \
-        'other-files::__git_other_files' \
+        'modified-files::__git_ignore_line_inside_arguments __git_modified_files' \
+        'other-files::__git_ignore_line_inside_arguments __git_other_files' \
         $ignored_files_alternatives && ret=0
       ;;
   esac
@@ -4524,7 +4523,11 @@ __git_ignore_line () {
 
 (( $+functions[__git_ignore_line_inside_arguments] )) ||
 __git_ignore_line_inside_arguments () {
-  __git_ignore_line ${*[-1]} ${*[1,-2]}
+  declare -a compadd_opts
+
+  zparseopts -D -E -a compadd_opts V: J: 1 2 n f X: M: P: S: r: R: q F:
+
+  __git_ignore_line $* $compadd_opts
 }
 
 # Common Argument Types
-- 
cgit 1.4.1