Skip to content

merge-tree: batched merges

Elijah Newren via GitGitGadget git 1 version New

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest2 patches 0 repliesNew

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/2merge-tree: update documentation for differences in -z outputDocumentation/git-merge-tree.txt+39 -70 replies
2/2merge-tree: support multiple batched merges with --stdinDocumentation/git-merge-tree.txt builtin/merge-tree.c t/t4301-merge-tree-write-tree.sh+109 -40 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.

Read the v1 thread

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

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

Signature · 1 line
gitgitgadget