[PATCH v2 36/41] completion: use __gitcomp_builtin in _git_revert

[Nguyễn Thái Ngọc Duy]

The new completable option is --gpg-sign

Signed-off-by: Nguyễn Thái Ngọc Duy <pclo...@gmail.com>
---
 builtin/revert.c                       | 12 +++++++++---
 contrib/completion/git-completion.bash |  5 +----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/builtin/revert.c b/builtin/revert.c
index b9d927eb09..c8e045911b 100644
--- a/builtin/revert.c
+++ b/builtin/revert.c
@@ -96,9 +96,15 @@ static int run_sequencer(int argc, const char **argv, struct 
replay_opts *opts)
        const char *me = action_name(opts);
        int cmd = 0;
        struct option base_options[] = {
-               OPT_CMDMODE(0, "quit", &cmd, N_("end revert or cherry-pick 
sequence"), 'q'),
-               OPT_CMDMODE(0, "continue", &cmd, N_("resume revert or 
cherry-pick sequence"), 'c'),
-               OPT_CMDMODE(0, "abort", &cmd, N_("cancel revert or cherry-pick 
sequence"), 'a'),
+               OPT_CMDMODE_F(0, "quit", &cmd,
+                             N_("end revert or cherry-pick sequence"),
+                             'q', PARSE_OPT_NOCOMPLETE),
+               OPT_CMDMODE_F(0, "continue", &cmd,
+                             N_("resume revert or cherry-pick sequence"),
+                             'c', PARSE_OPT_NOCOMPLETE),
+               OPT_CMDMODE_F(0, "abort", &cmd,
+                             N_("cancel revert or cherry-pick sequence"),
+                             'a', PARSE_OPT_NOCOMPLETE),
                OPT_BOOL('n', "no-commit", &opts->no_commit, N_("don't 
automatically commit")),
                OPT_BOOL('e', "edit", &opts->edit, N_("edit the commit 
message")),
                OPT_NOOP_NOARG('r', NULL),
diff --git a/contrib/completion/git-completion.bash 
b/contrib/completion/git-completion.bash
index a830c9c854..d6215c494e 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -2687,10 +2687,7 @@ _git_revert ()
        fi
        case "$cur" in
        --*)
-               __gitcomp "
-                       --edit --mainline --no-edit --no-commit --signoff
-                       --strategy= --strategy-option=
-                       "
+               __gitcomp_builtin revert "--no-edit"
                return
                ;;
        esac
-- 
2.16.1.205.g271f633410