@matheusbsbs / matheus-bagliano / commits / 9bcde4d531

rebase: remove transitory rebase.useBuiltin setting & env

Remove the rebase.useBuiltin setting and the now-obsolete GIT_TEST_REBASE_USE_BUILTIN test flag. This was left in place after my d03ebd411c6 (rebase: remove the rebase.useBuiltin setting, 2019-03-18) to help anyone who'd used the experimental flag and wanted to know that it was the default, or that they should transition their test environment to use the builtin rebase unconditionally. It's been more than long enough for those users to get a headsup about this. So remove all the scaffolding that was left inplace after d03ebd411c6. I'm also removing the documentation entry, if anyone still has this left in their configuration they can do some source archaeology to figure out what it used to do, which makes more sense than exposing every git user reading the documentation to this legacy configuration switch. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Ævar Arnfjörð Bjarmason committed Mar 23, 2021 at 16:23 UTC 9bcde4d53143f0b74604fa012c703f3794f94f80

3 files changed -34

Documentation/config/rebase.txt

-7

@@ -1,10 +1,3 @@

1 -rebase.useBuiltin::

2 - Unused configuration variable. Used in Git versions 2.20 and

3 - 2.21 as an escape hatch to enable the legacy shellscript

4 - implementation of rebase. Now the built-in rewrite of it in C

5 - is always used. Setting this will emit a warning, to alert any

6 - remaining users that setting this now does nothing.

7 -

1 rebase.backend::

2 Default backend to use for rebasing. Possible choices are

3 'apply' or 'merge'. In the future, if the merge backend gains

builtin/rebase.c

-11

@@ -100,7 +100,6 @@ struct rebase_options {

100 char *strategy, *strategy_opts;

101 struct strbuf git_format_patch_opt;

102 int reschedule_failed_exec;

103 - int use_legacy_rebase;

103 int reapply_cherry_picks;

104 int fork_point;

105 };

@@ -1102,11 +1101,6 @@ static int rebase_config(const char *var, const char *value, void *data)

1101 return 0;

1102 }

1103

1105 - if (!strcmp(var, "rebase.usebuiltin")) {

1106 - opts->use_legacy_rebase = !git_config_bool(var, value);

1107 - return 0;

1108 - }

1109 -

1104 if (!strcmp(var, "rebase.backend")) {

1105 return git_config_string(&opts->default_backend, var, value);

1106 }

@@ -1441,11 +1435,6 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)

1435 gpg_sign = options.gpg_sign_opt ? "" : NULL;

1436 FREE_AND_NULL(options.gpg_sign_opt);

1437

1444 - if (options.use_legacy_rebase ||

1445 - !git_env_bool("GIT_TEST_REBASE_USE_BUILTIN", -1))

1446 - warning(_("the rebase.useBuiltin support has been removed!\n"

1447 - "See its entry in 'git help config' for details."));

1448 -

1438 strbuf_reset(&buf);

1439 strbuf_addf(&buf, "%s/applying", apply_dir());

1440 if(file_exists(buf.buf))

t/t3400-rebase.sh

-16

@@ -388,22 +388,6 @@ test_expect_success 'rebase--merge.sh and --show-current-patch' '

388 )

389 '

390

391 -test_expect_success 'rebase -c rebase.useBuiltin=false warning' '

392 - expected="rebase.useBuiltin support has been removed" &&

393 -

394 - # Only warn when the legacy rebase is requested...

395 - test_must_fail git -c rebase.useBuiltin=false rebase 2>err &&

396 - test_i18ngrep "$expected" err &&

397 - test_must_fail env GIT_TEST_REBASE_USE_BUILTIN=false git rebase 2>err &&

398 - test_i18ngrep "$expected" err &&

399 -

400 - # ...not when we would have used the built-in anyway

401 - test_must_fail git -c rebase.useBuiltin=true rebase 2>err &&

402 - test_must_be_empty err &&

403 - test_must_fail env GIT_TEST_REBASE_USE_BUILTIN=true git rebase 2>err &&

404 - test_must_be_empty err

405 -'

406 -

391 test_expect_success 'switch to branch checked out here' '

392 git checkout main &&

393 git rebase main main