rebase: default to using the builtin rebase
authorPratik Karki <predatoramigo@gmail.com>
Wed, 8 Aug 2018 15:53:02 +0000 (21:38 +0545)
committerJunio C Hamano <gitster@pobox.com>
Thu, 11 Oct 2018 05:19:42 +0000 (14:19 +0900)
Now that the builtin rebase is feature-complete, we should use it by
default. Let's keep the legacy scripted version around for the time
being; Once the builtin rebase is well-tested enough, we can remove
`git-legacy-rebase.sh`.

Signed-off-by: Pratik Karki <predatoramigo@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/rebase.c
index 60e357c7350270433e195188fee24d204dc0d96f..9dc8475cd361af2ad712f4f53df3453df5f9bd45 100644 (file)
@@ -54,7 +54,7 @@ static int use_builtin_rebase(void)
        cp.git_cmd = 1;
        if (capture_command(&cp, &out, 6)) {
                strbuf_release(&out);
        cp.git_cmd = 1;
        if (capture_command(&cp, &out, 6)) {
                strbuf_release(&out);
-               return 0;
+               return 1;
        }
 
        strbuf_trim(&out);
        }
 
        strbuf_trim(&out);