Revert "Merge branch 'ra/rebase-i-more-options'"

[thirdparty/git.git] / builtin / rebase.c

diff --git a/builtin/rebase.c b/builtin/rebase.c
index e354ec84bb3926862713e6789619b2b512b5b02d..8081741f8aac4e64010ae11871078917b5d535e8 100644 (file)
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -79,11 +79,8 @@ struct rebase_options {
        int allow_rerere_autoupdate;
        int keep_empty;
        int autosquash;
-       int ignore_whitespace;
        char *gpg_sign_opt;
        int autostash;
-       int committer_date_is_author_date;
-       int ignore_date;
        char *cmd;
        int allow_empty_message;
        int rebase_merges, rebase_cousins;
@@ -102,7 +99,6 @@ struct rebase_options {
 
 static struct replay_opts get_replay_opts(const struct rebase_options *opts)
 {
-       struct strbuf strategy_buf = STRBUF_INIT;
        struct replay_opts replay = REPLAY_OPTS_INIT;
 
        replay.action = REPLAY_INTERACTIVE_REBASE;
@@ -116,20 +112,10 @@ static struct replay_opts get_replay_opts(const struct rebase_options *opts)
        replay.allow_empty_message = opts->allow_empty_message;
        replay.verbose = opts->flags & REBASE_VERBOSE;
        replay.reschedule_failed_exec = opts->reschedule_failed_exec;
-       replay.committer_date_is_author_date =
-                                       opts->committer_date_is_author_date;
-       replay.ignore_date = opts->ignore_date;
        replay.gpg_sign = xstrdup_or_null(opts->gpg_sign_opt);
        replay.strategy = opts->strategy;
-
        if (opts->strategy_opts)
-               strbuf_addstr(&strategy_buf, opts->strategy_opts);
-       if (opts->ignore_whitespace)
-               strbuf_addstr(&strategy_buf, " --ignore-space-change");
-       if (strategy_buf.len)
-               parse_strategy_opts(&replay, strategy_buf.buf);
-
-       strbuf_release(&strategy_buf);
+               parse_strategy_opts(&replay, opts->strategy_opts);
 
        if (opts->squash_onto) {
                oidcpy(&replay.squash_onto, opts->squash_onto);
@@ -531,8 +517,6 @@ int cmd_rebase__interactive(int argc, const char **argv, const char *prefix)
        argc = parse_options(argc, argv, prefix, options,
                        builtin_rebase_interactive_usage, PARSE_OPT_KEEP_ARGV0);
 
-       opts.strategy_opts = xstrdup_or_null(opts.strategy_opts);
-
        if (!is_null_oid(&squash_onto))
                opts.squash_onto = &squash_onto;
 
@@ -986,12 +970,6 @@ static int run_am(struct rebase_options *opts)
        am.git_cmd = 1;
        argv_array_push(&am.args, "am");
 
-       if (opts->ignore_whitespace)
-               argv_array_push(&am.args, "--ignore-whitespace");
-       if (opts->committer_date_is_author_date)
-               argv_array_push(&opts->git_am_opts, "--committer-date-is-author-date");
-       if (opts->ignore_date)
-               argv_array_push(&opts->git_am_opts, "--ignore-date");
        if (opts->action && !strcmp("continue", opts->action)) {
                argv_array_push(&am.args, "--resolved");
                argv_array_pushf(&am.args, "--resolvemsg=%s", resolvemsg);
@@ -1459,17 +1437,16 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
                        PARSE_OPT_NOARG, NULL, REBASE_DIFFSTAT },
                OPT_BOOL(0, "signoff", &options.signoff,
                         N_("add a Signed-off-by: line to each commit")),
-               OPT_BOOL(0, "committer-date-is-author-date",
-                        &options.committer_date_is_author_date,
-                        N_("make committer date match author date")),
-               OPT_BOOL(0, "reset-author-date", &options.ignore_date,
-                        N_("ignore author date and use current date")),
-               OPT_HIDDEN_BOOL(0, "ignore-date", &options.ignore_date,
-                               N_("synonym of --reset-author-date")),
+               OPT_PASSTHRU_ARGV(0, "ignore-whitespace", &options.git_am_opts,
+                                 NULL, N_("passed to 'git am'"),
+                                 PARSE_OPT_NOARG),
+               OPT_PASSTHRU_ARGV(0, "committer-date-is-author-date",
+                                 &options.git_am_opts, NULL,
+                                 N_("passed to 'git am'"), PARSE_OPT_NOARG),
+               OPT_PASSTHRU_ARGV(0, "ignore-date", &options.git_am_opts, NULL,
+                                 N_("passed to 'git am'"), PARSE_OPT_NOARG),
                OPT_PASSTHRU_ARGV('C', NULL, &options.git_am_opts, N_("n"),
                                  N_("passed to 'git apply'"), 0),
-               OPT_BOOL(0, "ignore-whitespace", &options.ignore_whitespace,
-                        N_("ignore changes in whitespace")),
                OPT_PASSTHRU_ARGV(0, "whitespace", &options.git_am_opts,
                                  N_("action"), N_("passed to 'git apply'"), 0),
                OPT_BIT('f', "force-rebase", &options.flags,
@@ -1742,13 +1719,11 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
                    state_dir_base, cmd_live_rebase, buf.buf);
        }
 
-       if (options.committer_date_is_author_date ||
-           options.ignore_date)
-               options.flags |= REBASE_FORCE;
-
        for (i = 0; i < options.git_am_opts.argc; i++) {
                const char *option = options.git_am_opts.argv[i], *p;
-               if (!strcmp(option, "--whitespace=fix") ||
+               if (!strcmp(option, "--committer-date-is-author-date") ||
+                   !strcmp(option, "--ignore-date") ||
+                   !strcmp(option, "--whitespace=fix") ||
                    !strcmp(option, "--whitespace=strip"))
                        options.flags |= REBASE_FORCE;
                else if (skip_prefix(option, "-C", &p)) {