bash completion: More completions for 'git stash'

Add branch subcommand to completions and USAGE for git-stash.sh.
Complete stash names for show, apply, drop, pop, and branch.
Add "--index" long option for apply.

Signed-off-by: Lee Marlow <lee.marlow@gmail.com>
Acked-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 265842712e3826b78758e92b98edb0ee89119d30..49a03c314e9159c11a31c065f50ceef4acdcd873 100755 (executable)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1371,7 +1371,7 @@ _git_show_branch ()
 
 _git_stash ()
 {
 
 _git_stash ()
 {

-       local subcommands='save list show apply clear drop pop create'
+       local subcommands='save list show apply clear drop pop create branch'

        local subcommand="$(__git_find_subcommand "$subcommands")"
        if [ -z "$subcommand" ]; then
                __gitcomp "$subcommands"
        local subcommand="$(__git_find_subcommand "$subcommands")"
        if [ -z "$subcommand" ]; then
                __gitcomp "$subcommands"


@@ -1381,6 +1381,16 @@ _git_stash ()
                save,--*)
                        __gitcomp "--keep-index"
                        ;;
                save,--*)
                        __gitcomp "--keep-index"
                        ;;

+               apply,--*)
+                       __gitcomp "--index"
+                       ;;
+               show,--*|apply,--*|drop,--*|pop,--*|branch,--*)
+                       COMPREPLY=()
+                       ;;
+               show,*|apply,*|drop,*|pop,*|branch,*)
+                       __gitcomp "$(git --git-dir="$(__gitdir)" stash list \
+                                       | sed -n -e 's/:.*//p')"
+                       ;;

                *)
                        COMPREPLY=()
                        ;;
                *)
                        COMPREPLY=()
                        ;;

diff --git a/git-stash.sh b/git-stash.sh
index d4609ed66e56dc6021c800d60286bec38615ff39..5ad2c4b7a33cf1be24ee85f17c8738ca05b98db0 100755 (executable)
--- a/git-stash.sh
+++ b/git-stash.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Copyright (c) 2007, Nanako Shiraishi
 
 #!/bin/sh
 # Copyright (c) 2007, Nanako Shiraishi
 

-USAGE='[  | save | list | show | apply | clear | drop | pop | create ]'
+USAGE='[  | save | list | show | apply | clear | drop | pop | create | branch ]'

 
 SUBDIRECTORY_OK=Yes
 OPTIONS_SPEC=
 
 SUBDIRECTORY_OK=Yes
 OPTIONS_SPEC=