threads / patch / 54359

patch, 2 partsgit-completion.bash: __git_diff_common_options: add --[no-]patch

Subject: [PATCH 1/2] git-completion.bash: __git_diff_common_options: add --[no-]patch

## tl;dr

3 messages between Oct 6, 2020 and Oct 7, 2020. Diffs are folded; open one to read it.

replies: 2people: 2as markdown or json

Robert Karszniewicz· Oct 6, 2020, 22:06 UTC · lore

At the same time also deduplicate those options from command completions which use $__git_diff_common_options.

Signed-off-by: Robert Karszniewicz <avoidr@posteo.de>
---
 contrib/completion/git-completion.bash | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Show changes to contrib/completion/git-completion.bash +2 −3

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· Oct 6, 2020, 22:06 UTC · re: Robert Karszniewicz · lore

[PATCH 2/2] git-completion.bash: stash-show: complete $__git_diff_common_options

Signed-off-by: Robert Karszniewicz <avoidr@posteo.de>
---
 contrib/completion/git-completion.bash | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Show changes to contrib/completion/git-completion.bash +4 −1

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· Oct 7, 2020, 17:54 UTC · re: Robert Karszniewicz · lore

Re: [PATCH 1/2] git-completion.bash: __git_diff_common_options: add --[no-]patch

Robert Karszniewicz <avoidr@posteo.de> writes:

Show 7 quoted lines

> At the same time also deduplicate those options from command completions
> which use $__git_diff_common_options.
>
> Signed-off-by: Robert Karszniewicz <avoidr@posteo.de>
> ---
>  contrib/completion/git-completion.bash | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)

Makes sense.  Will queue together with [2/2].  Thanks.