bash: update 'git stash' completion

This update adds 'git stash (apply|pop) --quiet' and all options known
to 'git stash save', and handles the DWIMery from 3c2eb80f (stash:
simplify defaulting to "save" and reject unknown options, 2009-08-18).
Care is taken to avoid offering subcommands in the DWIM case.

Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
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 277af5e86162346e9017188248693db61ed9feab..7ebc61bf113a14cad2f04d34a768bef96a906741 100755 (executable)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1876,18 +1876,30 @@ _git_show_branch ()
 
 _git_stash ()
 {
 
 _git_stash ()
 {

+       local cur="${COMP_WORDS[COMP_CWORD]}"
+       local save_opts='--keep-index --no-keep-index --quiet --patch'

        local subcommands='save list show apply clear drop pop create branch'
        local subcommand="$(__git_find_on_cmdline "$subcommands")"
        if [ -z "$subcommand" ]; then
        local subcommands='save list show apply clear drop pop create branch'
        local subcommand="$(__git_find_on_cmdline "$subcommands")"
        if [ -z "$subcommand" ]; then

-               __gitcomp "$subcommands"
+               case "$cur" in
+               --*)
+                       __gitcomp "$save_opts"
+                       ;;
+               *)
+                       if [ -z "$(__git_find_on_cmdline "$save_opts")" ]; then
+                               __gitcomp "$subcommands"
+                       else
+                               COMPREPLY=()
+                       fi
+                       ;;
+               esac

        else
        else

-               local cur="${COMP_WORDS[COMP_CWORD]}"

                case "$subcommand,$cur" in
                save,--*)
                case "$subcommand,$cur" in
                save,--*)

-                       __gitcomp "--keep-index"
+                       __gitcomp "$save_opts"

                        ;;
                apply,--*|pop,--*)
                        ;;
                apply,--*|pop,--*)

-                       __gitcomp "--index"
+                       __gitcomp "--index --quiet"

                        ;;
                show,--*|drop,--*|branch,--*)
                        COMPREPLY=()
                        ;;
                show,--*|drop,--*|branch,--*)
                        COMPREPLY=()