rebase -i: skip unnecessary picks using the rebase--helper

diff --git a/builtin/rebase--helper.c b/builtin/rebase--helper.c
index 305adb5b7079b23f41c11dd21ea00e5d0eae1f1a..057ae7102ff652047a673c54a7864e3e7f21c3a9 100644 (file)
--- a/builtin/rebase--helper.c
+++ b/builtin/rebase--helper.c
@@ -15,7 +15,7 @@ int cmd_rebase__helper(int argc, const char **argv, const char *prefix)
        int keep_empty = 0;
        enum {
                CONTINUE = 1, ABORT, MAKE_SCRIPT, SHORTEN_SHA1S, EXPAND_SHA1S,
-               CHECK_TODO_LIST
+               CHECK_TODO_LIST, SKIP_UNNECESSARY_PICKS
        } command = 0;
        struct option options[] = {
                OPT_BOOL(0, "ff", &opts.allow_ff, N_("allow fast-forward")),
@@ -32,6 +32,8 @@ int cmd_rebase__helper(int argc, const char **argv, const char *prefix)
                        N_("expand SHA-1s in the todo list"), EXPAND_SHA1S),
                OPT_CMDMODE(0, "check-todo-list", &command,
                        N_("check the todo list"), CHECK_TODO_LIST),
+               OPT_CMDMODE(0, "skip-unnecessary-picks", &command,
+                       N_("skip unnecessary picks"), SKIP_UNNECESSARY_PICKS),
                OPT_END()
        };
 
@@ -56,5 +58,7 @@ int cmd_rebase__helper(int argc, const char **argv, const char *prefix)
                return !!transform_todo_ids(0);
        if (command == CHECK_TODO_LIST && argc == 1)
                return !!check_todo_list();
+       if (command == SKIP_UNNECESSARY_PICKS && argc == 1)
+               return !!skip_unnecessary_picks();
        usage_with_options(builtin_rebase_helper_usage, options);
 }