From 7b559ca54aeaefac807b419150db3b16d983e3d4 Mon Sep 17 00:00:00 2001
From: Clint Adams <clint@users.sourceforge.net>
Date: Thu, 21 Aug 2008 01:03:18 +0000
Subject: 25495: always complete cached files after git checkout --.

---
 Completion/Unix/Command/_git | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'Completion')

diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index 9b8aec0a1..5d656569a 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -1543,10 +1543,8 @@ _git-checkout () {
     new_branch_reflog_arg='-l[create the new branch'\''s reflog]'
   fi
 
-  if (( words[(I)--] > 0 && words[(I)--] < CURRENT )); then
-    _arguments -C -S \
-      - update-files \
-        '*::file:->files' && ret=0
+  if compset -N '--'; then
+    __git_cached_files
   else
     _arguments -C -S \
         '-q[suppress feedback messages]' \
-- 
cgit 1.4.1