mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-02 10:01:11 +02:00
Code Releases Activity

23627: merge in from Nikolai Weibull's repository fixes for git hash-object, index-pack, merge-index.

Browse source
This commit is contained in:
Clint Adams 2007-07-01 16:55:05 +00:00
parent 622d3e7f1d
commit f8f845bfed
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -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:

7
Completion/Unix/Command/_git
View file

@ -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