From: Lee Marlow Date: Tue, 5 Aug 2008 05:50:35 +0000 (-0600) Subject: bash completion: More completions for 'git stash' X-Git-Tag: v1.6.0-rc2~11 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/95d43780cff575cfffeea881464c77f84f8d7244?ds=inline;hp=--cc 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 Acked-by: Shawn O. Pearce Signed-off-by: Junio C Hamano --- 95d43780cff575cfffeea881464c77f84f8d7244 diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 265842712e..49a03c314e 100755 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1371,7 +1371,7 @@ _git_show_branch () _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" @@ -1381,6 +1381,16 @@ _git_stash () 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=() ;; diff --git a/git-stash.sh b/git-stash.sh index d4609ed66e..5ad2c4b7a3 100755 --- a/git-stash.sh +++ b/git-stash.sh @@ -1,7 +1,7 @@ #!/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=