[PATCH] completion: git: stash: handle 'save' being the default

[PATCH] completion: git: stash: handle 'save' being the default

[Daniel Hahler]

From: Daniel Hahler <git@thequod.de>

"git stash" should complete arguments for "git stash save", but without
the message part.
---
 Completion/Unix/Command/_git | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index 50eb4d3..9552780 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -1519,6 +1519,7 @@ _git-stash () {
   case $state in
     (command)
       local -a commands
+      local -a save_arguments
 
       commands=(
         save:'save your local modifications to a new stash'
@@ -1531,19 +1532,24 @@ _git-stash () {
         drop:'remove a single stashed state from the stash list'
         create:'create a stash without storing it in the ref namespace')
 
+      save_arguments=(
+        '(--keep-index)--patch[interactively select hunks from diff between HEAD and working tree to stash]' \
+          '(             --no-keep-index)--keep-index[all changes already added to the index are left intact]' \
+          '(--keep-index                )--no-keep-index[all changes already added to the index are undone]' \
+          '(-q --quiet)'{-q,--quiet}'[suppress all output]' \
+          '(-u --include-untracked)'{-u,--include-untracked}'[include untracked files]' \
+      )
       _describe -t commands command commands && ret=0
+      _arguments -S $save_arguments && ret=0  # "stash" defaults to "save", but without "message".
       ;;
     (option-or-argument)
       curcontext=${curcontext%:*}-$line[1]:
 
       case $line[1] in
         (save)
+          _arguments -S $save_arguments && ret=0
           _arguments -S \
-            '(--keep-index)--patch[interactively select hunks from diff between HEAD and working tree to stash]' \
-            '(             --no-keep-index)--keep-index[all changes already added to the index are left intact]' \
-            '(--keep-index                )--no-keep-index[all changes already added to the index are undone]' \
-            '(-q --quiet)'{-q,--quiet}'[suppress all output]' \
-            '(-u --include-untracked)'{-u,--include-untracked}'[include untracked files]' \
+            $save_arguments \
             ':: :_guard "([^-]?#|)" message' && ret=0
           ;;
         (list)
-- 
2.3.0.dirty

Re: [PATCH] completion: git: stash: handle 'save' being the default

[Bart Schaefer]

On Feb 8,  3:17pm, Daniel Hahler wrote:
}
} "git stash" should complete arguments for "git stash save", but without
} the message part.

Thank you; this had been bugging me.

Re: [PATCH] completion: git: stash: handle 'save' being the default

[Frank Terbeck]

Hi Daniel

Daniel Hahler wrote:
> […completion patches…]

I think all four of your patches are correct, so I just pushed them to
the central repo. Thanks!


Regards, Frank