Merge branch 'tg/stash-push-fixup'

The shell completion script (in contrib/) learned "git stash" has
a new "push" subcommand.

* tg/stash-push-fixup:
  completion: add git stash push
This commit is contained in:
Junio C Hamano 2017-05-29 12:34:52 +09:00
commit 6f7f11f7aa

View File

@ -2813,7 +2813,7 @@ _git_show_branch ()
_git_stash () _git_stash ()
{ {
local save_opts='--all --keep-index --no-keep-index --quiet --patch --include-untracked' local save_opts='--all --keep-index --no-keep-index --quiet --patch --include-untracked'
local subcommands='save list show apply clear drop pop create branch' local subcommands='push save list show apply clear drop pop create branch'
local subcommand="$(__git_find_on_cmdline "$subcommands")" local subcommand="$(__git_find_on_cmdline "$subcommands")"
if [ -z "$subcommand" ]; then if [ -z "$subcommand" ]; then
case "$cur" in case "$cur" in
@ -2828,6 +2828,9 @@ _git_stash ()
esac esac
else else
case "$subcommand,$cur" in case "$subcommand,$cur" in
push,--*)
__gitcomp "$save_opts --message"
;;
save,--*) save,--*)
__gitcomp "$save_opts" __gitcomp "$save_opts"
;; ;;