diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-03-31 00:35:37 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-03-31 00:35:37 +0300 |
| commit | dc2a073036ccbd3d8aa707b98e996b6fb9bcd751 (patch) | |
| tree | af8333a906f2bacf22659affd0e51965b2b658bb /builtin | |
| parent | 501380286295cac300dae86c3f0f6c10ff34b767 (diff) | |
| parent | 9bcde4d53143f0b74604fa012c703f3794f94f80 (diff) | |
Merge branch 'ab/remove-rebase-usebuiltin'
Remove the final hint that we used to have a scripted "git rebase".
* ab/remove-rebase-usebuiltin:
rebase: remove transitory rebase.useBuiltin setting & env
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/rebase.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/builtin/rebase.c b/builtin/rebase.c index de400f9a19..783b526f6e 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -100,7 +100,6 @@ 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; }; @@ -1102,11 +1101,6 @@ 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); - return 0; - } - if (!strcmp(var, "rebase.backend")) { return git_config_string(&opts->default_backend, var, value); } @@ -1441,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)) |