summary refs log tree commit diff
path: root/Completion/Unix/Command
diff options
context:
space:
mode:
authorClint Adams <clint@users.sourceforge.net>2008-08-21 01:03:18 +0000
committerClint Adams <clint@users.sourceforge.net>2008-08-21 01:03:18 +0000
commit7b559ca54aeaefac807b419150db3b16d983e3d4 (patch)
treea6605b67fad07b284096c0fbc912d89510c7dfc2 /Completion/Unix/Command
parented34e682adff83223e30bf8d0317f08b3cc9db64 (diff)
downloadzsh-7b559ca54aeaefac807b419150db3b16d983e3d4.tar.gz
zsh-7b559ca54aeaefac807b419150db3b16d983e3d4.tar.xz
zsh-7b559ca54aeaefac807b419150db3b16d983e3d4.zip
25495: always complete cached files after git checkout --.
Diffstat (limited to 'Completion/Unix/Command')
-rw-r--r--Completion/Unix/Command/_git6
1 files changed, 2 insertions, 4 deletions
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]' \