Merge branch 'en/ort-perf-batch-9'

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

diff --git a/builtin/rebase.c b/builtin/rebase.c
index 840dbd7eb7772e47f408f05468f21df153e9cc20..783b526f6e758a05a75524d86f91088bb7ba5b87 100644 (file)
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -100,8 +100,8 @@ struct rebase_options {
        char *strategy, *strategy_opts;
        struct strbuf git_format_patch_opt;
        int reschedule_failed_exec;
-       int use_legacy_rebase;
        int reapply_cherry_picks;
+       int fork_point;
 };
 
 #define REBASE_OPTIONS_INIT {                          \
@@ -111,7 +111,8 @@ struct rebase_options {
                .default_backend = "merge",             \
                .flags = REBASE_NO_QUIET,               \
                .git_am_opts = STRVEC_INIT,             \
-               .git_format_patch_opt = STRBUF_INIT     \
+               .git_format_patch_opt = STRBUF_INIT,    \
+               .fork_point = -1,                       \
        }
 
 static struct replay_opts get_replay_opts(const struct rebase_options *opts)
@@ -1095,8 +1096,8 @@ static int rebase_config(const char *var, const char *value, void *data)
                return 0;
        }
 
-       if (!strcmp(var, "rebase.usebuiltin")) {
-               opts->use_legacy_rebase = !git_config_bool(var, value);
+       if (!strcmp(var, "rebase.forkpoint")) {
+               opts->fork_point = git_config_bool(var, value) ? -1 : 0;
                return 0;
        }
 
@@ -1306,7 +1307,6 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
        const char *gpg_sign = NULL;
        struct string_list exec = STRING_LIST_INIT_NODUP;
        const char *rebase_merges = NULL;
-       int fork_point = -1;
        struct string_list strategy_options = STRING_LIST_INIT_NODUP;
        struct object_id squash_onto;
        char *squash_onto_name = NULL;
@@ -1406,7 +1406,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
                        N_("mode"),
                        N_("try to rebase merges instead of skipping them"),
                        PARSE_OPT_OPTARG, NULL, (intptr_t)""},
-               OPT_BOOL(0, "fork-point", &fork_point,
+               OPT_BOOL(0, "fork-point", &options.fork_point,
                         N_("use 'merge-base --fork-point' to refine upstream")),
                OPT_STRING('s', "strategy", &options.strategy,
                           N_("strategy"), N_("use the given merge strategy")),
@@ -1435,11 +1435,6 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
        gpg_sign = options.gpg_sign_opt ? "" : NULL;
        FREE_AND_NULL(options.gpg_sign_opt);
 
-       if (options.use_legacy_rebase ||
-           !git_env_bool("GIT_TEST_REBASE_USE_BUILTIN", -1))
-               warning(_("the rebase.useBuiltin support has been removed!\n"
-                         "See its entry in 'git help config' for details."));
-
        strbuf_reset(&buf);
        strbuf_addf(&buf, "%s/applying", apply_dir());
        if(file_exists(buf.buf))
@@ -1494,7 +1489,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
                        die(_("cannot combine '--keep-base' with '--root'"));
        }
 
-       if (options.root && fork_point > 0)
+       if (options.root && options.fork_point > 0)
                die(_("cannot combine '--root' with '--fork-point'"));
 
        if (action != ACTION_NONE && !in_progress)
@@ -1840,8 +1835,8 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
                                                                    NULL);
                        if (!options.upstream_name)
                                error_on_missing_default_upstream();
-                       if (fork_point < 0)
-                               fork_point = 1;
+                       if (options.fork_point < 0)
+                               options.fork_point = 1;
                } else {
                        options.upstream_name = argv[0];
                        argc--;
@@ -1945,7 +1940,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
        } else
                BUG("unexpected number of arguments left to parse");
 
-       if (fork_point > 0) {
+       if (options.fork_point > 0) {
                struct commit *head =
                        lookup_commit_reference(the_repository,
                                                &options.orig_head);