summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--Completion/Unix/Command/_git3
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index f4e77ee0a..0b6f3c6e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-04-21  Frank Terbeck  <ft@bewatermyfriend.org>
+
+	* Valentin Haenel: 29019, Completion/Unix/Command/_git: Fix git
+	stash completion (apply and pop subcommands).
+
 2011-04-19  Peter Stephenson  <pws@csr.com>
 
 	* unposted: Completion/X/Command/.distfiles, Config/version.mk:
@@ -14485,5 +14490,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.5254 $
+* $Revision: 1.5255 $
 *****************************************************
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index 000c1a43b..37ea3383a 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -1331,10 +1331,11 @@ _git-stash () {
             ':: :__git_stashes' && ret=0
           ;;
         (pop|apply)
-          _arguments -
+          _arguments \
             '--index[try to reinstate the changes added to the index as well]' \
             '(-q --quiet)'{-q,--quiet}'[suppress all output]' \
             ':: :__git_stashes' && ret=0
+          ;;
         (branch)
           _arguments \
             ': :__git_guard_branch-name' \