{"thread":{"id":"54359","subject":"[PATCH 1/2] git-completion.bash: __git_diff_common_options: add --[no-]patch","startedAt":"2020-10-06T22:06:58Z","lastAt":"2020-10-07T17:54:59Z","messageCount":3,"participants":["Robert Karszniewicz","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"407018","messageId":"20201006220637.28139-1-avoidr@posteo.de","threadId":"54359","inReplyTo":null,"subject":"[PATCH 1/2] git-completion.bash: __git_diff_common_options: add --[no-]patch","fromName":"Robert Karszniewicz","fromEmail":"avoidr@posteo.de","sentAt":"2020-10-06T22:06:36Z","receivedAt":"2020-10-06T22:06:58Z","isPatch":true,"sender":{"key":"avoidr@posteo.de","avatar":null},"body":"At the same time also deduplicate those options from command completions\nwhich use $__git_diff_common_options.\n\nSigned-off-by: Robert Karszniewicz <avoidr@posteo.de>\n---\n contrib/completion/git-completion.bash | 5 ++---\n 1 file changed, 2 insertions(+), 3 deletions(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex 0a96ad87e7..f363554996 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1688,6 +1688,7 @@ __git_diff_common_options=\"--stat --numstat --shortstat --summary\n \t\t\t--submodule --submodule= --ignore-submodules\n \t\t\t--indent-heuristic --no-indent-heuristic\n \t\t\t--textconv --no-textconv\n+\t\t\t--patch --no-patch\n \"\n \n _git_diff ()\n@@ -2031,11 +2032,9 @@ _git_log ()\n \t\t\t--no-walk --no-walk= --do-walk\n \t\t\t--parents --children\n \t\t\t--expand-tabs --expand-tabs= --no-expand-tabs\n-\t\t\t--patch\n \t\t\t$merge\n \t\t\t$__git_diff_common_options\n \t\t\t--pickaxe-all --pickaxe-regex\n-\t\t\t--patch --no-patch\n \t\t\t\"\n \t\treturn\n \t\t;;\n@@ -2938,7 +2937,7 @@ _git_show ()\n \t\t;;\n \t--*)\n \t\t__gitcomp \"--pretty= --format= --abbrev-commit --no-abbrev-commit\n-\t\t\t--oneline --show-signature --patch\n+\t\t\t--oneline --show-signature\n \t\t\t--expand-tabs --expand-tabs= --no-expand-tabs\n \t\t\t$__git_diff_common_options\n \t\t\t\"\n-- \n2.28.0\n\n"},{"id":"407019","messageId":"20201006220637.28139-2-avoidr@posteo.de","threadId":"54359","inReplyTo":"20201006220637.28139-1-avoidr@posteo.de","subject":"[PATCH 2/2] git-completion.bash: stash-show: complete $__git_diff_common_options","fromName":"Robert Karszniewicz","fromEmail":"avoidr@posteo.de","sentAt":"2020-10-06T22:06:37Z","receivedAt":"2020-10-06T22:07:03Z","isPatch":true,"sender":{"key":"avoidr@posteo.de","avatar":null},"body":"Signed-off-by: Robert Karszniewicz <avoidr@posteo.de>\n---\n contrib/completion/git-completion.bash | 5 ++++-\n 1 file changed, 4 insertions(+), 1 deletion(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex f363554996..83bc64607b 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -3020,7 +3020,10 @@ _git_stash ()\n \t\tlist,--*)\n \t\t\t__gitcomp \"--name-status --oneline --patch-with-stat\"\n \t\t\t;;\n-\t\tshow,--*|branch,--*)\n+\t\tshow,--*)\n+\t\t\t__gitcomp \"$__git_diff_common_options\"\n+\t\t\t;;\n+\t\tbranch,--*)\n \t\t\t;;\n \t\tbranch,*)\n \t\t\tif [ $cword -eq 3 ]; then\n-- \n2.28.0\n\n"},{"id":"407078","messageId":"xmqqd01t3or5.fsf@gitster.c.googlers.com","threadId":"54359","inReplyTo":"20201006220637.28139-1-avoidr@posteo.de","subject":"Re: [PATCH 1/2] git-completion.bash: __git_diff_common_options: add --[no-]patch","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2020-10-07T17:54:54Z","receivedAt":"2020-10-07T17:54:59Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Robert Karszniewicz <avoidr@posteo.de> writes:\n\n> At the same time also deduplicate those options from command completions\n> which use $__git_diff_common_options.\n>\n> Signed-off-by: Robert Karszniewicz <avoidr@posteo.de>\n> ---\n>  contrib/completion/git-completion.bash | 5 ++---\n>  1 file changed, 2 insertions(+), 3 deletions(-)\n\nMakes sense.  Will queue together with [2/2].  Thanks.\n"}]}