diff options
| author |  Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2018-11-14 09:15:06 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-11-16 19:02:54 +0900 |
| commit | 62c23938fae5b7a374388c64fbdf8ee9ecb51b92 (patch) | |
| tree | 58a0e635b737b4fd0abf7f1f6076357dbe73cfa5 | |
| parent | rebase doc: document rebase.useBuiltin (diff) | |
| download | tgif-62c23938fae5b7a374388c64fbdf8ee9ecb51b92.tar.xz | |
tests: add a special setup where rebase.useBuiltin is off
Add a GIT_TEST_REBASE_USE_BUILTIN=false test mode which is equivalent
to running with rebase.useBuiltin=false. This is needed to spot that
we're not introducing any regressions in the legacy rebase version
while we're carrying both it and the new builtin version.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/rebase.c | 5 | ||||
| -rw-r--r-- | t/README | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/builtin/rebase.c b/builtin/rebase.c index 0ee06aa363..68ad8c1149 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -48,7 +48,10 @@ static int use_builtin_rebase(void) { struct child_process cp = CHILD_PROCESS_INIT; struct strbuf out = STRBUF_INIT; - int ret; + int ret, env = git_env_bool("GIT_TEST_REBASE_USE_BUILTIN", -1); + + if (env != -1) + return env; argv_array_pushl(&cp.args, "config", "--bool", "rebase.usebuiltin", NULL); @@ -339,6 +339,10 @@ for the index version specified. Can be set to any valid version GIT_TEST_PRELOAD_INDEX=<boolean> exercises the preload-index code path by overriding the minimum number of cache entries required per thread. +GIT_TEST_REBASE_USE_BUILTIN=<boolean>, when false, disables the +builtin version of git-rebase. See 'rebase.useBuiltin' in +git-config(1). + GIT_TEST_INDEX_THREADS=<n> enables exercising the multi-threaded loading of the index for the whole test suite by bypassing the default number of cache entries and thread minimums. Setting this to 1 will make the |