Merge branch 'pk/rebase-in-c-6-final'

diff --git a/builtin/rebase.c b/builtin/rebase.c
index 789d8698425b2faed583e3a446ac7d082252d282..f1355efee7a023b0080c4b952c7206f4db14b0c9 100644 (file)
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -55,7 +55,7 @@ static int use_builtin_rebase(void)
        cp.git_cmd = 1;
        if (capture_command(&cp, &out, 6)) {
                strbuf_release(&out);
-               return 0;
+               return 1;
        }
 
        strbuf_trim(&out);