Re: [PATCH v3 6/5] SubmittingPatches: choice of base for fixing an older maintenance track

From: Eric Sunshine <sunshine@sunshineco.com>
Date: Jul 26, 2023, 05:40 UTC
Message-ID: <CAPig+cSheNKUg7=v4i6Kr6zs8Jftooq4c_4gkGUcpMRDia-0oQ@mail.gmail.com>
In-Reply-To: <xmqqh6prfe0u.fsf_-_@gitster.g>

On Wed, Jul 26, 2023 at 1:38 AM Junio C Hamano <gitster@pobox.com> wrote:

Show 16 quoted lines

> When working on an high-value bugfix that must be given to ancient
> maintenance tracks, a starting point that is older than `maint` may
> have to be chosen.
>
> Helped-by: Linus Arver <linusa@google.com>
> Signed-off-by: Junio C Hamano <gitster@pobox.com>
> ---
> diff --git a/Documentation/SubmittingPatches b/Documentation/SubmittingPatches
> @@ -46,7 +46,12 @@ latest HEAD commit of `maint` or `master` based on the following cases:
>  * If you are fixing bugs in the released version, use `maint` as the
>    starting point (which may mean you have to fix things without using
>    new API features on the cutting edge that recently appeared in
> -  `master` but were not available in the released version).
> +  `master` but were not available in the released version). If the bug
> +  exists in an older version (e.g., commit `X` introduced the bug, and
> +  `git describe --containx X` says `v2.30.0-rc2-gXXXXXX` has it), then

s/containx/contains/

> +  use the tip of the maintenance branch for the 2.30.x versions in the
> +  `maint-2.30` branch in https://github.com/gitster/git[the maintainer's
> +  repo].