summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2018-03-07 01:05:01 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-03-07 19:02:48 (GMT)
commitb475e442e8ec64e77acd7cb8c9c9bb321a76e82d (patch)
tree81cca01f4f6a84a6c57765f905cf5c0f8a991ee3
parentfc3d4e0cbe65639509c765726fe01a16575e9ae8 (diff)
downloadgit-b475e442e8ec64e77acd7cb8c9c9bb321a76e82d.zip
git-b475e442e8ec64e77acd7cb8c9c9bb321a76e82d.tar.gz
git-b475e442e8ec64e77acd7cb8c9c9bb321a76e82d.tar.bz2
completion: don't set PARSE_OPT_NOCOMPLETE on --rerere-autoupdate
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 needed). This makes --rerere-autoupdate completable for am, cherry-pick and revert. rebase completion is fixed manually because it's a shell script and does not benefit from --git-completion-helper. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--contrib/completion/git-completion.bash4
-rw-r--r--parse-options.h4
-rw-r--r--rerere.h3
3 files changed, 5 insertions, 6 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 0ddf400..0d858ca 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -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
@@ -1963,6 +1962,7 @@ _git_rebase ()
--autostash --no-autostash
--verify --no-verify
--keep-empty --root --force-rebase --no-ff
+ --rerere-autoupdate
--exec
"
diff --git a/parse-options.h b/parse-options.h
index 0ba0869..ab1cc36 100644
--- a/parse-options.h
+++ b/parse-options.h
@@ -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 }
diff --git a/rerere.h b/rerere.h
index 5e5a312..c2961fe 100644
--- a/rerere.h
+++ b/rerere.h
@@ -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