From: Ville Skyttä Date: Thu, 21 May 2020 14:21:56 GMT Subject: [PATCH] completion: fix completing stashes with "show -p" Message-ID: <20200521142156.4717-1-ville.skytta@iki.fi> Regression in df70b190bdd2add42a906819f9d41dbf91cf0809 Signed-off-by: Ville Skyttä --- contrib/completion/git-completion.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 70ad04e1b2..8dc4ad0e0d 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -2782,7 +2782,7 @@ _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 + if [ -z "$subcommand" -a -n "$(__git_find_on_cmdline "-p")" ]; then subcommand="push" fi if [ -z "$subcommand" ]; then -- 2.27.0.rc1.dirty