Re: [PATCH v3 0/4] Add regression tests for recent rebase -i fixes

From: Junio C Hamano <gitster@pobox.com>
Date: Jun 23, 2017, 18:53 UTC
Message-ID: <xmqqr2yaedsv.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <xmqqfueqfxfv.fsf@gitster.mtv.corp.google.com>

Junio C Hamano <gitster@pobox.com> writes:

Show 6 quoted lines

> 3404 needs a similar fix-up for the series to be able to stand on
> its own.  Alternatively, at least we need to understand what in 'pu'
> makes the result of the merge pass---the symptom indicates that this
> topic cannot be merged to a released version without that unknown
> other topic in 'pu' merged if we want to keep POISON build passing
> the tests.

Ah, no worries.  I think I figured it out.

The topic "rebase -i regression fix", which this "regression fix tests" builds on, is queued on an older codebase than 0d75bfe6 ("tests: fix tests broken under GETTEXT_POISON=YesPlease", 2017-05-05); it is natural these old test breakages can be seen when the topic is tested alone.

So we can safely merge this topic down.

Thanks for prodding me to take a deeper look.