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
Junio C Hamano <gitster@pobox.com>
Date
Jul 27, 2023, 20:08 UTC
Message-ID
<xmqqedktazhv.fsf@gitster.g>
In-Reply-To
<owlyila5f8qp.fsf@fine.c.googlers.com>
Linus Arver <linusa@google.com> writes:
> I just have small wording nits (see below), but otherwise LGTM.
Thanks.  Rolled typo/format fixes in.
1:  e3386ce69d ! 1:  f835de52d7 SubmittingPatches: explain why 'next' and above are inappropriate base
    @@ Documentation/SubmittingPatches: latest HEAD commit of `maint` or `master` based
     +flight work well together. This is why both `next` and `seen` are
     +frequently re-integrated with incoming patches on the mailing list and
     +force-pushed to replace previous versions of themselves. A topic that is
    -+literally built on top of `next` cannot be merged to 'master' without
    ++literally built on top of `next` cannot be merged to `master` without
     +dragging in all the other topics in `next`, some of which may not be
     +ready.
      
2:  6b2650d32f ! 2:  369998df83 SubmittingPatches: use of older maintenance tracks is an exception
    @@ Documentation/SubmittingPatches: latest HEAD commit of `maint` or `master` based
      * Otherwise (such as if you are adding new features) use `master`.
      
     +
    -+NOTE: In an exceptional case, a bug that was introduced in an old
    ++NOTE: In exceptional cases, a bug that was introduced in an old
     +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
    ++maintenance branch for the 2.30.x series, which may be available in the
     +`maint-2.30` branch in https://github.com/gitster/git[the maintainer's
     +"broken out" repo].
     +
Previous: Linus Arver
Message 38 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.