Re: [PATCH v2 06/11] git-svn tests: rewrite brittle tests to use "--[no-]merges".

From: Junio C Hamano <gitster@pobox.com>
Date: Jan 16, 2021, 21:51 UTC
Message-ID: <xmqqo8hoo8j5.fsf@gitster.c.googlers.com>
In-Reply-To: <20210116153554.12604-7-avarab@gmail.com>

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

Show 8 quoted lines

> From: Jeff King <peff@peff.net>
>
> Rewrite a brittle tests which used "rev-list" without "--[no-]merges"
> to figure out if a set of commits turned into merge commits or not.
>
> Signed-off-by: Jeff King <peff@peff.net>
> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
> Commit-message-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>

The last two entries are not chronological, but when you relay a patch by others with tweaks, we typically do it more like this:

    From: Jeff King <peff@peff.net>

    Rewrite a brittle ...

    Signed-off-by: Jeff King <peff@peff.net>
    [ÆAB: wrote commit message]
    Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>

e.g. cf. 155067ab4f, a9ecaa06a723, 567ad2c0f9

Thanks.