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

Re: [PATCH v3 00/21] git-p4: Various code tidy-ups

From
Junio C Hamano <gitster@pobox.com>
Date
Feb 3, 2022, 21:30 UTC
Message-ID
<xmqq8rurskmw.fsf@gitster.g>
In-Reply-To
<BL0PR12MB4849847CD8385F0FABD9AE95C8289@BL0PR12MB4849.namprd12.prod.outlook.com>
Joel Holdsworth <jholdsworth@nvidia.com> writes:
> At what point will the next branch be merged into master? At the
> point of the next release, or before? I couldn't find any
> information about it.

Each topic that is in 'next' is merged to 'master' individually when it is ready, so topics A, B, and C may have got merged to 'next' in this order, but only A and C may be merged while B may stay in 'next' while waiting for necessary follow-on work.

The answer is "'next' is never merged as a whole to 'master'". From time to time, the tip of 'next' and 'master' may happen to have the same tree when all topics merged to 'next' have graduated to 'master' while no new topics become ready for 'next', but that is a mere coincidence and not a designed part of the workflow.

Perhaps looking for "Note from the maintainer" in the list archive would find more info, hopefully?

Show 5 quoted lines
> The SubmittingPatches guide talks about branching off master, and merging the prerequisite topic branches. For this patch-set I will need:
>
>   * jh/p4-spawning-external-commands-cleanup
>   * jh/p4-fix-use-of-process-error-exception
>   * ab/config-based-hooks-2

Correct. FWIW, I was updating the "What's cooking" report and am planning to propose merging the first two to 'master' either today or tomorrow as part of the first batch, and the last one in the next batch after a few days.

> If I then do "git send-email [...] origin/master" you will get all
> these patches included in my emails. Is this expected? It seems
> undesirable.

You'd use "git format-patch [...] $BASE" where $BASE is the commit you'll locally create by merging these prerequisite topics to 'master'.

Thanks.
Previous: Joel HoldsworthNext: Joel Holdsworth
Message 26 of 29 in “git-p4: Various code tidy-ups”
  1. 00/21 git-p4: Various code tidy-upsJoel Holdsworth, Jan 16, 2022
  2. 02/21 git-p4: remove unneeded semicolons from statementsJoel Holdsworth, Jan 16, 2022
  3. Junio C HamanoJan 17, 2022
  4. 01/21 git-p4: add blank lines between functions and class definitionsJoel Holdsworth, Jan 16, 2022
  5. 03/21 git-p4: indent with 4-spacesJoel Holdsworth, Jan 16, 2022
  6. 04/21 git-p4: improve consistency of docstring formattingJoel Holdsworth, Jan 16, 2022
  7. 05/21 git-p4: convert descriptive class and function comments into docstringsJoel Holdsworth, Jan 16, 2022
  8. 06/21 git-p4: remove commented codeJoel Holdsworth, Jan 16, 2022
  9. 07/21 git-p4: sort and de-duplcate pylint disable listJoel Holdsworth, Jan 16, 2022
  10. 08/21 git-p4: remove padding from lists, tuples and function argumentsJoel Holdsworth, Jan 16, 2022
  11. 09/21 git-p4: remove spaces around default argumentsJoel Holdsworth, Jan 16, 2022
  12. 10/21 git-p4: removed brackets when assigning multiple return valuesJoel Holdsworth, Jan 16, 2022
  13. 11/21 git-p4: place a single space after every commaJoel Holdsworth, Jan 16, 2022
  14. 12/21 git-p4: remove extraneous spaces before function argumentsJoel Holdsworth, Jan 16, 2022
  15. 13/21 git-p4: remove redundant backslash-continuations inside bracketsJoel Holdsworth, Jan 16, 2022
  16. 14/21 git-p4: remove spaces between dictionary keys and colonsJoel Holdsworth, Jan 16, 2022
  17. 15/21 git-p4: ensure every comment has a single #Joel Holdsworth, Jan 16, 2022
  18. 16/21 git-p4: ensure there is a single space around all operatorsJoel Holdsworth, Jan 16, 2022
  19. 17/21 git-p4: normalize indentation of lines in conditionalsJoel Holdsworth, Jan 16, 2022
  20. 18/21 git-p4: compare to singletons with "is" and "is not"Joel Holdsworth, Jan 16, 2022
  21. 20/21 git-p4: move inline comments to line aboveJoel Holdsworth, Jan 16, 2022
  22. 21/21 git-p4: seperate multiple statements onto seperate linesJoel Holdsworth, Jan 16, 2022
  23. 19/21 git-p4: only seperate code blocks by a single empty lineJoel Holdsworth, Jan 16, 2022
  24. Junio C HamanoJan 17, 2022
  25. Joel HoldsworthFeb 3, 2022
  26. Junio C HamanoFeb 3, 2022
  27. Joel HoldsworthFeb 4, 2022
  28. Junio C HamanoFeb 4, 2022
  29. Junio C HamanoJan 17, 2022

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.