# [PATCH 1/2] git-completion.bash: __git_diff_common_options: add --[no-]patch 3 messages from 2020-10-06 to 2020-10-07. Participants: Robert Karszniewicz, Junio C Hamano. Thread: https://gitlist.dev/t/54359 ## Robert Karszniewicz, 2020-10-06 22:06 Subject: [PATCH 1/2] git-completion.bash: __git_diff_common_options: add --[no-]patch Message-ID: <20201006220637.28139-1-avoidr@posteo.de> URL: https://gitlist.dev/e/20201006220637.28139-1-avoidr%40posteo.de ``` At the same time also deduplicate those options from command completions which use $__git_diff_common_options. Signed-off-by: Robert Karszniewicz --- contrib/completion/git-completion.bash | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 0a96ad87e7..f363554996 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1688,6 +1688,7 @@ __git_diff_common_options="--stat --numstat --shortstat --summary --submodule --submodule= --ignore-submodules --indent-heuristic --no-indent-heuristic --textconv --no-textconv + --patch --no-patch " _git_diff () @@ -2031,11 +2032,9 @@ _git_log () --no-walk --no-walk= --do-walk --parents --children --expand-tabs --expand-tabs= --no-expand-tabs - --patch $merge $__git_diff_common_options --pickaxe-all --pickaxe-regex - --patch --no-patch " return ;; @@ -2938,7 +2937,7 @@ _git_show () ;; --*) __gitcomp "--pretty= --format= --abbrev-commit --no-abbrev-commit - --oneline --show-signature --patch + --oneline --show-signature --expand-tabs --expand-tabs= --no-expand-tabs $__git_diff_common_options " -- 2.28.0 ``` ## Robert Karszniewicz, 2020-10-06 22:06 Subject: [PATCH 2/2] git-completion.bash: stash-show: complete $__git_diff_common_options Message-ID: <20201006220637.28139-2-avoidr@posteo.de> URL: https://gitlist.dev/e/20201006220637.28139-2-avoidr%40posteo.de In-Reply-To: <20201006220637.28139-1-avoidr@posteo.de> ``` Signed-off-by: Robert Karszniewicz --- contrib/completion/git-completion.bash | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index f363554996..83bc64607b 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -3020,7 +3020,10 @@ _git_stash () list,--*) __gitcomp "--name-status --oneline --patch-with-stat" ;; - show,--*|branch,--*) + show,--*) + __gitcomp "$__git_diff_common_options" + ;; + branch,--*) ;; branch,*) if [ $cword -eq 3 ]; then -- 2.28.0 ``` ## Junio C Hamano, 2020-10-07 17:54 Subject: Re: [PATCH 1/2] git-completion.bash: __git_diff_common_options: add --[no-]patch Message-ID: URL: https://gitlist.dev/e/xmqqd01t3or5.fsf%40gitster.c.googlers.com In-Reply-To: <20201006220637.28139-1-avoidr@posteo.de> ``` Robert Karszniewicz writes: > At the same time also deduplicate those options from command completions > which use $__git_diff_common_options. > > Signed-off-by: Robert Karszniewicz > --- > contrib/completion/git-completion.bash | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) Makes sense. Will queue together with [2/2]. Thanks. ```