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

[PATCH 0/2] merge-tree: batched merges

From
Elijah Newren via GitGitGadget <gitgitgadget@gmail.com>
Date
Oct 23, 2022, 01:28 UTC
Message-ID
<pull.1361.git.1666488485.gitgitgadget@gmail.com>

When a branch is updated, a Git hosting provider may want to check all open code reviews targetting the given branch to determine if those code reviews can still merge cleanly into the target branch. Provide a new --stdin option to git-merge-tree to enable this capability, with each line of input providing the branches for the next merge.

Note: this still requires all the merges to be in the same repository. There
is some code I noticed a while back in merge-ort that implicitly uses
the_repository (indirectly), and there may be more uses that I am unaware
of.
Elijah Newren (2):
  merge-tree: update documentation for differences in -z output
  merge-tree: support multiple batched merges with --stdin
 Documentation/git-merge-tree.txt | 76 ++++++++++++++++++++++++++++----
 builtin/merge-tree.c             | 42 ++++++++++++++++--
 t/t4301-merge-tree-write-tree.sh | 41 +++++++++++++++++
 3 files changed, 148 insertions(+), 11 deletions(-)
base-commit: 45c9f05c44b1cb6bd2d6cb95a22cf5e3d21d5b63
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1361%2Fnewren%2Fbatched-merges-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1361/newren/batched-merges-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/1361
-- 
gitgitgadget
Next: Elijah Newren via GitGitGadget
Message 1 of 3 in “merge-tree: batched merges”
  1. 0/2 merge-tree: batched mergesElijah Newren via GitGitGadget, Oct 23, 2022
  2. 2/2 merge-tree: support multiple batched merges with --stdinElijah Newren via GitGitGadget, Oct 23, 2022
  3. 1/2 merge-tree: update documentation for differences in -z outputElijah Newren via GitGitGadget, Oct 23, 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.