nd/parseopt-completion fixups

There is not a strong reason to hide this option, and git-merge already completes this one. Let's allow to complete this for all commands (and let git-completion.bash do the suppressing if neede).

This makes --rerere-autoupdate completable for am, cherry-pick and revert.

Signed-off-by Nguyễn Thái Ngọc Duy <[email protected]>

This also adds completion for 'git notes remove' with two options:
--ignore-missing and --stdin.

For some strange reason, 'git notes undefined --<tab>' completes --ref without even running --git-completion-helper.

But since this is an error
case (and we're not doing anything destructive, it's probably ok for now)

Signed-off-by Nguyễn Thái Ngọc Duy <[email protected]>

---
 contrib/completion/git-completion.bash | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

contrib/completion/git-completion.bash +2 -14

index c310b241d3..ab80f4e6e8 100644
@@ -1836,19 +1836,8 @@ _git_notes ()
        add,--reedit-message=*|append,--reedit-message=*)
                __git_complete_refs --cur="${cur#*=}"
                ;;
-       add,--*)
-               __gitcomp_builtin notes_add
-               ;;
-       append,--*)
-               __gitcomp_builtin notes_append
-               ;;
-       copy,--*)
-               __gitcomp_builtin notes_copy
-               ;;
-       prune,--*)
-               __gitcomp_builtin notes_prune
-               ;;
-       prune,*)
+       *,--*)
+               __gitcomp_builtin notes_$subcommand
                ;;
        *)
                case "$prev" in
--

2.16.1.435.g8f24da2e1a

This also adds completion for 'git notes remove' with two options:
--ignore-missing and --stdin.

For some strange reason, 'git notes undefined --<tab>' completes --ref without even running --git-completion-helper. But since this is an error case (and we're not doing anything destructive, it's probably ok for now)

Signed-off-by Nguyễn Thái Ngọc Duy <[email protected]>

---
 contrib/completion/git-completion.bash | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

contrib/completion/git-completion.bash +0 -3

index c310b241d3..ab80f4e6e8 100644
@@ -1836,19 +1836,8 @@ _git_notes ()
        add,--reedit-message=*|append,--reedit-message=*)
                __git_complete_refs --cur="${cur#*=}"
                ;;
-       add,--*)
-               __gitcomp_builtin notes_add
-               ;;

contrib/completion/git-completion.bash +2 -1

+       *,--*)
+               __gitcomp_builtin notes_$subcommand
                ;;
        *)
                case "$prev" in
--

2.16.1.435.g8f24da2e1a

There is not a strong reason to hide this option, and git-merge already completes this one. Let's allow to complete this for all commands (and let git-completion.bash do the suppressing if neede).

This makes --rerere-autoupdate completable for am, cherry-pick and revert.

Signed-off-by Nguyễn Thái Ngọc Duy <[email protected]>

---
 contrib/completion/git-completion.bash | 3 +--
 parse-options.h                        | 4 ++--
 rerere.h                               | 3 +--
 3 files changed, 4 insertions(+), 6 deletions(-)

contrib/completion/git-completion.bash +1 -2

index 0ddf40063b..c310b241d3 100644
@@ -1754,8 +1754,7 @@ _git_merge ()
 
 	case "$cur" in
 	--*)
-		__gitcomp_builtin merge "--rerere-autoupdate
-				--no-rerere-autoupdate
+		__gitcomp_builtin merge "--no-rerere-autoupdate
 				--no-commit --no-edit --no-ff
 				--no-log --no-progress
 				--no-squash --no-stat

parse-options.h +2 -2

index 0ba08691e6..ab1cc362bf 100644
@@ -148,8 +148,8 @@ struct option {
 #define OPT_STRING_LIST(s, l, v, a, h) \
 				    { OPTION_CALLBACK, (s), (l), (v), (a), \
 				      (h), 0, &parse_opt_string_list }
-#define OPT_UYN(s, l, v, h, f)      { OPTION_CALLBACK, (s), (l), (v), NULL, \
-				      (h), PARSE_OPT_NOARG|(f), &parse_opt_tertiary }
+#define OPT_UYN(s, l, v, h)         { OPTION_CALLBACK, (s), (l), (v), NULL, \
+				      (h), PARSE_OPT_NOARG, &parse_opt_tertiary }
 #define OPT_DATE(s, l, v, h) \
 	{ OPTION_CALLBACK, (s), (l), (v), N_("time"),(h), 0,	\
 	  parse_opt_approxidate_cb }

rerere.h +1 -2

index 5e5a312e4c..c2961feaaa 100644
@@ -37,7 +37,6 @@ extern void rerere_clear(struct string_list *);
 extern void rerere_gc(struct string_list *);
 
 #define OPT_RERERE_AUTOUPDATE(v) OPT_UYN(0, "rerere-autoupdate", (v), \
-	N_("update the index with reused conflict resolution if possible"), \
-	PARSE_OPT_NOCOMPLETE)
+	N_("update the index with reused conflict resolution if possible"))
 
 #endif

There is a minor behaviour change here, though. This

prune,*)

    ;;

case arm ensured that we don't list refs for 'git notes prune <TAB>', because it doesn't accept them (and then we take our usual fallback and let Bash complete filenames; yeah, 'git notes prune' doesn't accept filenames either, but, as I said, that's our usual fallback when we can't offer anything for completion).

This patch removes that case arm, and refs will be offered for 'git notes prune <TAB>'.

Quoted 5 lines

(quoted diff) +2 -0

+       *,--*)
+               __gitcomp_builtin notes_$subcommand
                ;;
        *)
                case "$prev" in

Quoted 5 lines · SZEDER Gábor

There is a minor behaviour change here, though. This

prune,*)

    ;;

Quoted 14 lines

case arm ensured that we don't list refs for 'git notes prune <TAB>', because it doesn't accept them (and then we take our usual fallback and let Bash complete filenames; yeah, 'git notes prune' doesn't accept filenames either, but, as I said, that's our usual fallback when we can't offer anything for completion).

This patch removes that case arm, and refs will be offered for 'git notes prune <TAB>'.

Quoted 5 lines

(quoted diff) +2 -0

+       *,--*)
+               __gitcomp_builtin notes_$subcommand
                ;;
        *)
                case "$prev" in

I have this tentatively queued on the topic. Can we wrap the topic up and move it forward, instead of leaving it (and other topics) hanging around and causing conflicts with other topics in flight, please?

Thanks.

Subject: [PATCH] SQUASH???

By Szeder <CAM0VKjmmF2t=B2s3rJoKmO3j6Bk5d6PEfCV==ONRGMcdUMLFpQ@mail.gmail.com>

---
 contrib/completion/git-completion.bash | 5 +++++
 1 file changed, 5 insertions(+)

contrib/completion/git-completion.bash +5 -0

index ab80f4e6e8..5f7495cda3 100644
@@ -1836,6 +1836,11 @@ _git_notes ()
 	add,--reedit-message=*|append,--reedit-message=*)
 		__git_complete_refs --cur="${cur#*=}"
 		;;
+	prune,--*)
+		__gitcomp_builtin notes_prune
+		;;
+	prune,*)
+		;;
 	*,--*)
 		__gitcomp_builtin notes_$subcommand
 		;;

Signature · 1 line

2.16.2-345-g7e31236f65

That works fine, but this would work just as well and has one less case arm:

contrib/completion/git-completion.bash +2 -0

index ab80f4e6e8..038af63c1a 100644
@@ -1839,6 +1839,8 @@ _git_notes ()
 	*,--*)
 		__gitcomp_builtin notes_$subcommand
 		;;
+	prune,*)
+		;;
 	*)
 		case "$prev" in
 		-m|-F)