about summary refs log tree commit diff
path: root/Completion/Unix
diff options
context:
space:
mode:
authorClint Adams <clint@users.sourceforge.net>2007-07-01 16:55:05 +0000
committerClint Adams <clint@users.sourceforge.net>2007-07-01 16:55:05 +0000
commitf8f845bfedde042953e07c796272b6fd2a0c1274 (patch)
treef9e720c0cb07871e458f9fbe034ce72b1cda1b08 /Completion/Unix
parent622d3e7f1d222cd97422ebea6f176714a3305579 (diff)
downloadzsh-f8f845bfedde042953e07c796272b6fd2a0c1274.tar.gz
zsh-f8f845bfedde042953e07c796272b6fd2a0c1274.tar.xz
zsh-f8f845bfedde042953e07c796272b6fd2a0c1274.zip
23627: merge in from Nikolai Weibull's repository fixes for git hash-object, index-pack, merge-index.
Diffstat (limited to 'Completion/Unix')
-rw-r--r--Completion/Unix/Command/_git7
1 files changed, 4 insertions, 3 deletions
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index a1a48794e..d6c9da724 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -271,17 +271,18 @@ _git-commit-tree () {
 
 _git-hash-object () {
   _arguments \
+    '(:)--stdin[read object from standard input]' \
     '-t[the type of object to create]:object type:((blob\:"a blob of data"
                                                     commit\:"a tree with parent commits"
                                                     tag\:"a symbolic name for another object"
                                                     tree\:"a recursive tree of blobs"))' \
     '-w[write the object to the object database]' \
-    ':file:_files' && ret=0
+    '(--stdin):file:_files' && ret=0
 }
 
 _git-index-pack () {
   _arguments \
-    '-o[write generated pack index into specified file]' \
+    '-o[write generated pack index into specified file]:file:_files' \
     ':pack file:_files -g "*.pack"' && ret=0
 }
 
@@ -294,7 +295,7 @@ _git-merge-index () {
   if (( CURRENT > 2 )) && [[ $words[CURRENT-1] != -[oq] ]]; then
     _arguments -S \
       '(:)-a[run merge against all files in the index that need merging]' \
-      '*:index file:__git_files' && ret=0
+      '*:index file:__git_cached_files' && ret=0
   else
     typeset -a arguments