Re: fc/pull-merge-rebase, was Re: What's cooking in git.git (Dec 2020, #01; Tue, 8)

From: Junio C Hamano <gitster@pobox.com>
Date: Dec 11, 2020, 05:59 UTC
Message-ID: <xmqqzh2knart.fsf@gitster.c.googlers.com>
In-Reply-To: <CAMP44s1dRKPtVr9Oazg_JR2WWMhNC_2rx7G4k3qME5FM4L4xTA@mail.gmail.com>

Felipe Contreras <felipe.contreras@gmail.com> writes:

> The commit is prefixed with "future:" it's not meant to be applied
> today, but months after the previous patch, perhaps even in Git 3.0.

And when it is applied in the future, it would break tests because they are not adjusted for the change in behaviour. So "today" is not the meaningful part of the above statement. It is not meant to be applied ever, as it is known to break the test suite. It is offerred merely as an illustration of a WIP, a preview of what to come.

You may have meant it as such, but (1) we never use "future:" to mean such a thing in this project, and (2) nowhere else in that commit it says the patch is not to be applied.

So your "this is not a real patch to be applied" failed to communicate. Let's try harder to avoid such miscommunication next time.

Thanks.