From: "Elijah Newren via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Elijah Newren <newren@gmail.com>
Subject: [PATCH 0/2] merge-tree: batched merges
Date: Sun, 23 Oct 2022 01:28:03 +0000 [thread overview]
Message-ID: <pull.1361.git.1666488485.gitgitgadget@gmail.com> (raw)
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 reply other threads:[~2022-10-23 1:28 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-23 1:28 Elijah Newren via GitGitGadget [this message]
2022-10-23 1:28 ` [PATCH 1/2] merge-tree: update documentation for differences in -z output Elijah Newren via GitGitGadget
2022-10-23 1:28 ` [PATCH 2/2] merge-tree: support multiple batched merges with --stdin Elijah Newren via GitGitGadget
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=pull.1361.git.1666488485.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=newren@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).