Re: [ANNOUNCE] Git v2.20.0-rc1
From: Junio C Hamano <hidden>
Date: 2018-11-25 01:00:50
Ævar Arnfjörð Bjarmason [off-list ref] writes:
quoted
* "git rebase" and "git rebase -i" have been reimplemented in C.Here's another regression in the C version (and rc1),... I wasn't trying to stress test rebase. I was just wanting to rebase a history I was about to force-push after cleaning it up, hardly an obscure use-case. So [repeat last transmission in https://public-inbox.org/git/87y39w1wc2.fsf@evledraar.gmail.com/ ]
which, to those who are reading from sidelines:
Given that we're still finding regressions bugs in the rebase-in-C
version should we be considering reverting 5541bd5b8f ("rebase: default
to using the builtin rebase", 2018-08-08)?
I love the feature, but fear that the current list of known regressions
serve as a canary for a larger list which we'd discover if we held off
for another major release (and would re-enable rebase.useBuiltin=true in
master right after 2.20 is out the door).
I am fine with the proposed flip, but I'll have to see the extent of
damage this late in the game so that I won't miss anything. In
addition to the one-liner below, we'd need to update the quoted
release notes entry, and possibly adjust some tests (even though the
"reimplementation" ought to be bug-to-bug compatible, it may not be).
diff --git b/builtin/rebase.c a/builtin/rebase.c
index 9dc8475cd3..60e357c735 100644
--- b/builtin/rebase.c
+++ a/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 1; + return 0; } strbuf_trim(&out);