summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--Completion/Unix/Command/_git7
2 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index fed190c86..0d569ecb3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-07-01  Clint Adams  <clint@zsh.org>
+
+	* 23627: Completion/Unix/Command/_git: merge in from Nikolai
+	Weibull's repository fixes for git hash-object, index-pack,
+	merge-index.
+
 2007-06-28  Oliver Kiddle  <opk@zsh.org>
 
 	* 23611: Completion/Unix/Command/_ldd, Completion/Unix/Type/_ld_debug:
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