git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 8/5] SubmittingPatches: use of older maintenance tracks is an exception

From
LALinus Arver <linusa@google.com>
Date
Jul 27, 2023, 19:35 UTC
Message-ID
<owlyila5f8qp.fsf@fine.c.googlers.com>
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:
Show 20 quoted lines
> 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.
Show 7 quoted lines
> +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
Show 8 quoted lines
> +`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
Previous: Junio C HamanoNext: Junio C Hamano
Message 37 of 38 in “SubmittingPatches: clarify which branch to use”
  1. 0/5 SubmittingPatches: clarify which branch to useLinus Arver via GitGitGadget, Jul 8, 2023
  2. 2/5 SubmittingPatches: be more explicitLinus Arver via GitGitGadget, Jul 8, 2023
  3. Junio C HamanoJul 8, 2023
  4. Linus ArverJul 13, 2023
  5. Junio C HamanoJul 13, 2023
  6. 1/5 SubmittingPatches: reword awkward phrasingLinus Arver via GitGitGadget, Jul 8, 2023
  7. Junio C HamanoJul 8, 2023
  8. 3/5 SubmittingPatches: discuss subsystems separately from git.gitLinus Arver via GitGitGadget, Jul 8, 2023
  9. 4/5 SubmittingPatches: remove confusing guidance about base branchesLinus Arver via GitGitGadget, Jul 8, 2023
  10. Junio C HamanoJul 8, 2023
  11. Linus ArverJul 13, 2023
  12. 5/5 SubmittingPatches: define topic branchesLinus Arver via GitGitGadget, Jul 8, 2023
  13. 0/5 SubmittingPatches: clarify which branch to useLinus Arver via GitGitGadget, Jul 14, 2023
  14. 2/5 SubmittingPatches: discuss subsystems separately from git.gitLinus Arver via GitGitGadget, Jul 14, 2023
  15. 1/5 SubmittingPatches: reword awkward phrasingLinus Arver via GitGitGadget, Jul 14, 2023
  16. 3/5 SubmittingPatches: de-emphasize branches as starting pointsLinus Arver via GitGitGadget, Jul 14, 2023
  17. 4/5 SubmittingPatches: emphasize need to communicate non-default starting pointsLinus Arver via GitGitGadget, Jul 14, 2023
  18. 5/5 SubmittingPatches: simplify guidance for choosing a starting pointLinus Arver via GitGitGadget, Jul 14, 2023
  19. Junio C HamanoJul 14, 2023
  20. Linus ArverJul 26, 2023
  21. Linus ArverJul 26, 2023
  22. Junio C HamanoJul 26, 2023
  23. 0/5 SubmittingPatches: clarify which branch to useLinus Arver via GitGitGadget, Jul 26, 2023
  24. 1/5 SubmittingPatches: reword awkward phrasingLinus Arver via GitGitGadget, Jul 26, 2023
  25. 4/5 SubmittingPatches: emphasize need to communicate non-default starting pointsLinus Arver via GitGitGadget, Jul 26, 2023
  26. 2/5 SubmittingPatches: discuss subsystems separately from git.gitLinus Arver via GitGitGadget, Jul 26, 2023
  27. 5/5 SubmittingPatches: simplify guidance for choosing a starting pointLinus Arver via GitGitGadget, Jul 26, 2023
  28. 3/5 SubmittingPatches: de-emphasize branches as starting pointsLinus Arver via GitGitGadget, Jul 26, 2023
  29. Junio C HamanoJul 26, 2023
  30. Linus ArverJul 26, 2023
  31. 6/5 SubmittingPatches: choice of base for fixing an older maintenance trackJunio C Hamano, Jul 26, 2023
  32. Eric SunshineJul 26, 2023
  33. Junio C HamanoJul 26, 2023
  34. 7/5 SubmittingPatches: explain why 'next' and above are inappropriate baseJunio C Hamano, Jul 26, 2023
  35. Linus ArverJul 27, 2023
  36. 8/5 SubmittingPatches: use of older maintenance tracks is an exceptionJunio C Hamano, Jul 26, 2023
  37. Linus ArverJul 27, 2023
  38. Junio C HamanoJul 27, 2023

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.