From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 29 May 2017 03:34:52 +0000 (+0900)
Subject: Merge branch 'tg/stash-push-fixup'
X-Git-Tag: v2.14.0-rc0~153
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/6f7f11f7aa7b95c1555cd389a219f76ee30b5cc7?hp=2becdbd47e14aad542875450e8f9c8e114109bfd

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
---

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 1ed0a09fee..45a78a0953 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -2813,7 +2813,7 @@ _git_show_branch ()
 _git_stash ()
 {
 	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")"
 	if [ -z "$subcommand" ]; then
 		case "$cur" in
@@ -2828,6 +2828,9 @@ _git_stash ()
 		esac
 	else
 		case "$subcommand,$cur" in
+		push,--*)
+			__gitcomp "$save_opts --message"
+			;;
 		save,--*)
 			__gitcomp "$save_opts"
 			;;