summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--Completion/Unix/Command/_git4
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index ad115dcde..b577ee08e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-04-20 Clint Adams <clint@zsh.org>
+
+ * Kalle Olavi Niemitalo: 26850: Completion/Unix/Command/_git:
+ fix breakage in git write-tree and git send-pack.
+
2009-04-18 Andrey Borzenkov <bor@zsh.org>
* users/14033 as modified by users/14037 and added doc:
@@ -11573,5 +11578,5 @@
*****************************************************
* This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.4656 $
+* $Revision: 1.4657 $
*****************************************************
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index d10492aa2..73cff80b6 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -753,7 +753,7 @@ _git-update-index () {
(( $+functions[_git-write-tree] )) ||
_git-write-tree () {
_arguments \
- '--missing-ok[ignore objects in the index that are missing in the object database]'
+ '--missing-ok[ignore objects in the index that are missing in the object database]' \
'--prefix=-[write tree representing given sub-directory]:sub-directory:_directories -r ""' && ret=0
}
@@ -1282,7 +1282,7 @@ _git-upload-archive () {
(( $+functions[_git-send-pack] )) ||
_git-send-pack () {
_arguments \
- '(--receive-pack --exec)'{--receive-pack=-,--exec=-}'[specify path to git-receive-pack on remote side]:remote path'
+ '(--receive-pack --exec)'{--receive-pack=-,--exec=-}'[specify path to git-receive-pack on remote side]:remote path' \
'--all[update all refs that exist locally]' \
'--force[update remote orphaned refs]' \
$verbose_arg \