Re: [ANNOUNCE] Git v2.20.0-rc1

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Nov 28, 2018, 09:30 UTC
Message-ID: <nycvar.QRO.7.76.6.1811281026380.41@tvgsbejvaqbjf.bet>
In-Reply-To: <xmqq5zwhu9on.fsf@gitster-ct.c.googlers.com>

Hi Junio,

On Wed, 28 Nov 2018, Junio C Hamano wrote:

Show 17 quoted lines

> Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> 
> > ...
> > In short, even a thorough study of the code (keeping in mind the few
> > tidbits of information provided by you) leaves me really wondering which
> > code you run, because it sure does not look like current `master` to me.
> >
> > And if it is not `master`, then I have to ask why you keep suggesting to
> > turn off the built-in rebase by default in `master`.
> >
> > Ciao,
> > Johannes
> >
> > P.S.: Maybe you have a hook you forgot to mention?
> 
> Any response?  Or can I retract jc/postpone-rebase-in-c that was
> prepared as a reaction to this?

I worked with Ævar via IRC and we figured out the root cause and I submitted https://public-inbox.org/git/pull.88.git.gitgitgadget@gmail.com/ to fix it.

Given that this is a really obscure edge case (`git rebase --stat -v -i` onto an unrelated commit history, if you take away one of these, the bug does not trigger), and that it was only discovered to be a bug *because* of the built-in rebase (the scripted version had the same bug, but simply forgot to do proper error checking), I would not think that the reported bug is a strong argument in favor of turning off the built-in rebase by defauly.

In other words, after understanding the bug I am even more confident than before that the built-in rebase is actually in a pretty good shape.

I do not expect any major regressions, and if any happen: we do have that escape hatch for corner cases while I fix those bugs.

Ciao, Dscho