From: Thomas Gummerer <t.gummerer@gmail.com>
To: git@vger.kernel.org
Cc: "SZEDER Gábor" <szeder.dev@gmail.com>,
"Junio C Hamano" <gitster@pobox.com>,
"Thomas Gummerer" <t.gummerer@gmail.com>
Subject: [PATCH v2 2/2] completion: make stash -p and alias for stash push -p
Date: Fri, 20 Apr 2018 00:25:14 +0100 [thread overview]
Message-ID: <20180419232514.16572-3-t.gummerer@gmail.com> (raw)
In-Reply-To: <20180419232514.16572-1-t.gummerer@gmail.com>
We define 'git stash -p' as an alias for 'git stash push -p' in the
manpage. Do the same in the completion script, so all options that
can be given to 'git stash push' are being completed when the user is
using 'git stash -p --<tab>'. Currently the only additional option
the user will get is '--message', but there may be more in the future.
Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com>
---
contrib/completion/git-completion.bash | 3 +++
1 file changed, 3 insertions(+)
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 9a95b3b7b1..adb6516b6d 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -2776,6 +2776,9 @@ _git_stash ()
local save_opts='--all --keep-index --no-keep-index --quiet --patch --include-untracked'
local subcommands='push list show apply clear drop pop create branch'
local subcommand="$(__git_find_on_cmdline "$subcommands save")"
+ if [ -n "$(__git_find_on_cmdline "-p")" ]; then
+ subcommand="push"
+ fi
if [ -z "$subcommand" ]; then
case "$cur" in
--*)
--
2.17.0.252.gfe0a9eaf31
next prev parent reply other threads:[~2018-04-19 23:25 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-17 21:29 [PATCH 0/3] completion: improvements for git stash Thomas Gummerer
2018-04-17 21:29 ` [PATCH 1/3] completion: rename save_opts to default_opts for stash Thomas Gummerer
2018-04-17 21:29 ` [PATCH 2/3] completion: stop completing 'save' as stash subcommand Thomas Gummerer
2018-04-17 21:29 ` [PATCH 3/3] completion: make stash -p and alias for stash push -p Thomas Gummerer
2018-04-18 8:32 ` [PATCH 0/3] completion: improvements for git stash Junio C Hamano
2018-04-18 21:15 ` Thomas Gummerer
2018-04-19 23:25 ` [PATCH v2 0/2] " Thomas Gummerer
2018-04-19 23:25 ` [PATCH v2 1/2] completion: stop showing 'save' for stash by default Thomas Gummerer
2018-04-20 5:17 ` Duy Nguyen
2018-04-22 20:36 ` Thomas Gummerer
2018-04-19 23:25 ` Thomas Gummerer [this message]
2018-04-20 1:38 ` [PATCH v2 0/2] completion: improvements for git stash Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180419232514.16572-3-t.gummerer@gmail.com \
--to=t.gummerer@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=szeder.dev@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).