Re: [PATCH 04/10] test-lib functions: add an --annotated-tag option to "test_commit"

From: Junio C Hamano <gitster@pobox.com>
Date: Mar 3, 2021, 06:35 UTC
Message-ID: <xmqqmtvklp7p.fsf@gitster.c.googlers.com>
In-Reply-To: <87czwhkif6.fsf@evledraar.gmail.com>

Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:

Show 11 quoted lines

> Yeah, as noted in the last paragraph of the commit message:
>     
>     The placement of --annotated-tag after "notick" in the case of the
>     documentation, and then after "no_tag" in the case of the code is
>     slightly inconsistent. It's to evade a merge conflict with two other
>     commits adding a --printf option, and another one adding documentation
>     for --no-tag.
>
> So the existing patch + not doing a bigger refactoring is because I
> didn't want to cause conflicts for you to solve with other in-flight
> topics. It would be easier with ab/pickaxe-pcre2 merged down :)

As things that are not yet in 'master' will not be merged down for a few weeks anyway, the conflicts don't matter that much---it is a valid choice not to accept new topics that conflicts with topics cooking in 'next' after all. That way, the number of topics that folks have to look at will not increase, which gives more opportunity for topics that are already in 'seen' to get reviewed ;-)