diff options
| author | Lee Marlow <lee.marlow@gmail.com> | 2008-08-04 23:50:35 -0600 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-08-05 21:21:19 -0700 |
| commit | 95d43780cff575cfffeea881464c77f84f8d7244 (patch) | |
| tree | 555b0868051fee70f252193606e8638eeb701851 | |
| parent | a6c2be244f45432617944e684156556482fb11b6 (diff) | |
| download | git-95d43780cff575cfffeea881464c77f84f8d7244.tar.gz git-95d43780cff575cfffeea881464c77f84f8d7244.tar.xz | |
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>
| -rwxr-xr-x | contrib/completion/git-completion.bash | 12 | ||||
| -rwxr-xr-x | git-stash.sh | 2 |
2 files changed, 12 insertions, 2 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 265842712..49a03c314 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 d4609ed66..5ad2c4b7a 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= |