Merge branch 'dd/poll-dot-h'

diff --git a/builtin/rebase.c b/builtin/rebase.c
index 8353a71e2148f17acdff31c9df8f0367c41bb35c..1a2758756af6918314dccb74aa691da403fb4132 100644 (file)
--- 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);