From: Linus Arver <linusa@google.com>
To: Junio C Hamano <gitster@pobox.com>,
Linus Arver via GitGitGadget <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 8/5] SubmittingPatches: use of older maintenance tracks is an exception
Date: Thu, 27 Jul 2023 12:35:26 -0700 [thread overview]
Message-ID: <owlyila5f8qp.fsf@fine.c.googlers.com> (raw)
In-Reply-To: <xmqq351bfdtj.fsf_-_@gitster.g>
Thank you for breaking out these patches (in the future I will try to do
it on my end to save you the trouble). I just have small wording nits
(see below), but otherwise LGTM.
Thanks again.
Junio C Hamano <gitster@pobox.com> writes:
> diff --git a/Documentation/SubmittingPatches b/Documentation/SubmittingPatches
> index 559c02c90c..0d1b53d4e5 100644
> --- a/Documentation/SubmittingPatches
> +++ b/Documentation/SubmittingPatches
> @@ -46,15 +46,22 @@ 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). 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
> - 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].
> + `master` but were not available in the released version).
>
> * Otherwise (such as if you are adding new features) use `master`.
>
> +
> +NOTE: In an exceptional case, a bug that was introduced in an old
I think "In exceptional cases" reads more naturally.
> +version may have to be fixed for users of releases that are much older
> +than the recent releases. `git describe --contains X` may describe
> +`X` as `v2.30.0-rc2-gXXXXXX` for the commit `X` that introduced the
> +bug, and the bug may be so high-impact that we may need to issue a new
> +maintenance release for Git 2.30.x series, when "Git 2.41.0" is the
> +current release. In such a case, you may want to use the tip of the
> +maintenance branch for the 2.30.x series, which may be available as
s/as/in the
> +`maint-2.30` branch in https://github.com/gitster/git[the maintainer's
> +"broken out" repo].
> +
> This also means that `next` or `seen` are inappropriate starting points
> for your work, if you want your work to have a realistic chance of
> graduating to `master`. They are simply not designed to be used as a
> --
> 2.41.0-450-ga80be15292
next prev parent reply other threads:[~2023-07-27 19:35 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-08 1:05 [PATCH 0/5] SubmittingPatches: clarify which branch to use Linus Arver via GitGitGadget
2023-07-08 1:05 ` [PATCH 1/5] SubmittingPatches: reword awkward phrasing Linus Arver via GitGitGadget
2023-07-08 5:37 ` Junio C Hamano
2023-07-08 1:05 ` [PATCH 2/5] SubmittingPatches: be more explicit Linus Arver via GitGitGadget
2023-07-08 5:36 ` Junio C Hamano
2023-07-13 21:03 ` Linus Arver
2023-07-13 21:10 ` Junio C Hamano
2023-07-08 1:05 ` [PATCH 3/5] SubmittingPatches: discuss subsystems separately from git.git Linus Arver via GitGitGadget
2023-07-08 1:05 ` [PATCH 4/5] SubmittingPatches: remove confusing guidance about base branches Linus Arver via GitGitGadget
2023-07-08 5:48 ` Junio C Hamano
2023-07-13 21:54 ` Linus Arver
2023-07-08 1:05 ` [PATCH 5/5] SubmittingPatches: define topic branches Linus Arver via GitGitGadget
2023-07-14 6:01 ` [PATCH v2 0/5] SubmittingPatches: clarify which branch to use Linus Arver via GitGitGadget
2023-07-14 6:01 ` [PATCH v2 1/5] SubmittingPatches: reword awkward phrasing Linus Arver via GitGitGadget
2023-07-14 6:01 ` [PATCH v2 2/5] SubmittingPatches: discuss subsystems separately from git.git Linus Arver via GitGitGadget
2023-07-14 6:01 ` [PATCH v2 3/5] SubmittingPatches: de-emphasize branches as starting points Linus Arver via GitGitGadget
2023-07-14 6:01 ` [PATCH v2 4/5] SubmittingPatches: emphasize need to communicate non-default " Linus Arver via GitGitGadget
2023-07-14 6:01 ` [PATCH v2 5/5] SubmittingPatches: simplify guidance for choosing a starting point Linus Arver via GitGitGadget
2023-07-14 17:31 ` Junio C Hamano
2023-07-26 1:36 ` Linus Arver
2023-07-26 2:31 ` Linus Arver
2023-07-26 4:41 ` Junio C Hamano
2023-07-26 3:04 ` [PATCH v3 0/5] SubmittingPatches: clarify which branch to use Linus Arver via GitGitGadget
2023-07-26 3:04 ` [PATCH v3 1/5] SubmittingPatches: reword awkward phrasing Linus Arver via GitGitGadget
2023-07-26 3:04 ` [PATCH v3 2/5] SubmittingPatches: discuss subsystems separately from git.git Linus Arver via GitGitGadget
2023-07-26 3:04 ` [PATCH v3 3/5] SubmittingPatches: de-emphasize branches as starting points Linus Arver via GitGitGadget
2023-07-26 3:05 ` [PATCH v3 4/5] SubmittingPatches: emphasize need to communicate non-default " Linus Arver via GitGitGadget
2023-07-26 3:05 ` [PATCH v3 5/5] SubmittingPatches: simplify guidance for choosing a starting point Linus Arver via GitGitGadget
2023-07-26 5:15 ` [PATCH v3 0/5] SubmittingPatches: clarify which branch to use Junio C Hamano
2023-07-26 17:19 ` Linus Arver
2023-07-26 5:16 ` [PATCH v3 6/5] SubmittingPatches: choice of base for fixing an older maintenance track Junio C Hamano
2023-07-26 5:40 ` Eric Sunshine
2023-07-26 16:36 ` Junio C Hamano
2023-07-26 5:17 ` [PATCH 7/5] SubmittingPatches: explain why 'next' and above are inappropriate base Junio C Hamano
2023-07-27 19:26 ` Linus Arver
2023-07-26 5:21 ` [PATCH 8/5] SubmittingPatches: use of older maintenance tracks is an exception Junio C Hamano
2023-07-27 19:35 ` Linus Arver [this message]
2023-07-27 20:08 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=owlyila5f8qp.fsf@fine.c.googlers.com \
--to=linusa@google.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).