diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-11-18 12:23:59 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-11-18 12:23:59 +0300 |
commit | 4520c233742cca267e1c0ba55f04f35ef7e9baf7 (patch) | |
tree | c492d0450700e918465d75e01e924d18f9327b2a /builtin | |
parent | 137c1f2f51bceb8d1f1f457c52129be78c0ac86d (diff) | |
parent | 62c23938fae5b7a374388c64fbdf8ee9ecb51b92 (diff) |
Merge branch 'ab/rebase-in-c-escape-hatch'
The recently merged "rebase in C" has an escape hatch to use the
scripted version when necessary, but it hasn't been documented,
which has been corrected.
* ab/rebase-in-c-escape-hatch:
tests: add a special setup where rebase.useBuiltin is off
rebase doc: document rebase.useBuiltin
Diffstat (limited to 'builtin')
-rw-r--r-- | builtin/rebase.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/builtin/rebase.c b/builtin/rebase.c index 8353a71e21..1a2758756a 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -49,7 +49,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); |