undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests: add a special setup where rebase.useBuiltin is off

Browse Source 
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>
This commit is contained in:
Ævar Arnfjörð Bjarmason 2018-11-14 09:15:06 +00:00 committed by Junio C Hamano
parent d8d0a546f0
commit 62c23938fa
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
builtin/rebase.c
View File

@ -48,7 +48,10 @@ static int use_builtin_rebase(void)
{ {
struct child_process cp = CHILD_PROCESS_INIT; struct child_process cp = CHILD_PROCESS_INIT;
struct strbuf out = STRBUF_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, argv_array_pushl(&cp.args,
"config", "--bool", "rebase.usebuiltin", NULL); "config", "--bool", "rebase.usebuiltin", NULL);

4
t/README
View File

@ -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 GIT_TEST_PRELOAD_INDEX=<boolean> exercises the preload-index code path
by overriding the minimum number of cache entries required per thread. 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 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 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 cache entries and thread minimums. Setting this to 1 will make the