From: Pratik Karki <predatoramigo@gmail.com>
Date: Wed, 8 Aug 2018 15:53:02 +0000 (+0545)
Subject: rebase: default to using the builtin rebase
X-Git-Tag: v2.20.0-rc0~88^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5541bd5b8f;p=thirdparty%2Fgit.git

rebase: default to using the builtin rebase

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>
---

diff --git a/builtin/rebase.c b/builtin/rebase.c
index 60e357c735..9dc8475cd3 100644
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -54,7 +54,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);