From: "Kyle Zhao via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Elijah Newren <newren@gmail.com>, kylezhao <kylezhao@tencent.com>,
Kyle Zhao <kylezhao@tencent.com>,
Kyle Zhao <kylezhao@tencent.com>
Subject: [PATCH v4 2/2] merge-tree.c: support --merge-base in conjunction with --stdin
Date: Tue, 01 Nov 2022 08:55:04 +0000 [thread overview]
Message-ID: <db47fbc663eb0f3a1fc9a063dfb1051bc64601af.1667292904.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.1397.v4.git.1667292904.gitgitgadget@gmail.com>
From: Kyle Zhao <kylezhao@tencent.com>
The previous change add "--merge-base" option in order to allow users to
specify merge-base for the merge. But it doesn't compatible well with
--stdin, because multiple batched merges can only have the same specified
base.
This patch allows users to pass --merge-base option into the input line,
such as:
printf "--merge-base=<b3> <b1> <b2>" | git merge-tree --stdin
This does a merge of b1 and b2, and uses b3 as the merge-base.
Signed-off-by: Kyle Zhao <kylezhao@tencent.com>
---
Documentation/git-merge-tree.txt | 3 ++-
builtin/merge-tree.c | 22 ++++++++++++++++++++--
t/t4301-merge-tree-write-tree.sh | 21 +++++++++++++++++++++
3 files changed, 43 insertions(+), 3 deletions(-)
diff --git a/Documentation/git-merge-tree.txt b/Documentation/git-merge-tree.txt
index d9dacb2ce54..be6a11bbaec 100644
--- a/Documentation/git-merge-tree.txt
+++ b/Documentation/git-merge-tree.txt
@@ -66,7 +66,8 @@ OPTIONS
--merge-base=<commit>::
Instead of finding the merge-bases for <branch1> and <branch2>,
- specify a merge-base for the merge.
+ specify a merge-base for the merge. When --stdin is passed, this
+ option should be passed into the input line.
[[OUTPUT]]
OUTPUT
diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c
index f402b807c0f..7a8049e7b0c 100644
--- a/builtin/merge-tree.c
+++ b/builtin/merge-tree.c
@@ -551,16 +551,34 @@ int cmd_merge_tree(int argc, const char **argv, const char *prefix)
if (o.mode == MODE_TRIVIAL)
die(_("--trivial-merge is incompatible with all other options"));
+ if (merge_base)
+ die(_("--merge-base should be passed into the input line"));
line_termination = '\0';
while (strbuf_getline_lf(&buf, stdin) != EOF) {
struct strbuf **split;
int result;
+ const char *input_merge_base = NULL;
+ const char *arg;
split = strbuf_split(&buf, ' ');
- if (!split[0] || !split[1] || split[2])
+ if (!split[0] || !split[1])
die(_("malformed input line: '%s'."), buf.buf);
strbuf_rtrim(split[0]);
- result = real_merge(&o, merge_base, split[0]->buf, split[1]->buf, prefix);
+
+ /* parse --merge-base=<commit> option */
+ arg = split[0]->buf;
+ if (skip_prefix(arg, "--merge-base=", &arg))
+ input_merge_base = arg;
+
+ if (input_merge_base && split[2] && !split[3]) {
+ strbuf_rtrim(split[1]);
+ result = real_merge(&o, input_merge_base, split[1]->buf, split[2]->buf, prefix);
+ } else if (!input_merge_base && !split[2]) {
+ result = real_merge(&o, NULL, split[0]->buf, split[1]->buf, prefix);
+ } else {
+ die(_("malformed input line: '%s'."), buf.buf);
+ }
+
if (result < 0)
die(_("merging cannot continue; got unclean result of %d"), result);
strbuf_list_free(split);
diff --git a/t/t4301-merge-tree-write-tree.sh b/t/t4301-merge-tree-write-tree.sh
index 5b0073d3dcd..aec2c00b91f 100755
--- a/t/t4301-merge-tree-write-tree.sh
+++ b/t/t4301-merge-tree-write-tree.sh
@@ -860,6 +860,13 @@ test_expect_success '--stdin with both a successful and a conflicted merge' '
test_cmp expect actual
'
+
+test_expect_success '--merge-base is incompatible with --stdin' '
+ test_must_fail git merge-tree --merge-base=side1 --stdin 2>expect &&
+
+ grep "^fatal: --merge-base should be passed into the input line" expect
+'
+
# specify merge-base as parent of branch2
# git merge-tree --write-tree --merge-base=c2 c1 c3
# Commit c1: add file1
@@ -890,4 +897,18 @@ test_expect_success 'specify merge-base as parent of branch2' '
)
'
+test_expect_success '--stdin with both a normal merge and a merge-base specified merge' '
+ cd base-b2-p &&
+ printf "c1 c3\n--merge-base=c2 c1 c3" | git merge-tree --stdin >actual &&
+
+ printf "1\0" >expect &&
+ git merge-tree --write-tree -z c1 c3 >>expect &&
+ printf "\0" >>expect &&
+
+ printf "1\0" >>expect &&
+ git merge-tree --write-tree -z --merge-base=c2 c1 c3 >>expect &&
+ printf "\0" >>expect &&
+ test_cmp expect actual
+'
+
test_done
--
gitgitgadget
next prev parent reply other threads:[~2022-11-01 8:55 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-27 12:12 [PATCH] merge-tree.c: add --merge-base=<commit> option Kyle Zhao via GitGitGadget
2022-10-27 18:09 ` Junio C Hamano
2022-10-28 8:20 ` Elijah Newren
2022-10-28 16:03 ` Junio C Hamano
2022-10-29 1:52 ` Elijah Newren
2022-10-28 11:43 ` [Internet]Re: " kylezhao(赵柯宇)
2022-10-28 8:13 ` Elijah Newren
2022-10-28 11:54 ` [Internet]Re: " kylezhao(赵柯宇)
2022-10-28 11:55 ` [PATCH v2] " Kyle Zhao via GitGitGadget
2022-10-29 1:32 ` Elijah Newren
2022-10-29 3:42 ` [PATCH v3] " Kyle Zhao via GitGitGadget
2022-11-01 1:08 ` Elijah Newren
2022-11-01 8:55 ` [PATCH v4 0/2] merge-tree: allow specifying a base commit when --write-tree is passed Kyle Zhao via GitGitGadget
2022-11-01 8:55 ` [PATCH v4 1/2] merge-tree.c: add --merge-base=<commit> option Kyle Zhao via GitGitGadget
2022-11-01 8:55 ` Kyle Zhao via GitGitGadget [this message]
2022-11-03 1:13 ` [PATCH v4 2/2] merge-tree.c: support --merge-base in conjunction with --stdin Elijah Newren
2022-11-03 3:28 ` [Internet]Re: " kylezhao(赵柯宇)
2022-11-01 21:19 ` [PATCH v4 0/2] merge-tree: allow specifying a base commit when --write-tree is passed Taylor Blau
2022-11-03 3:29 ` [PATCH v5 " Kyle Zhao via GitGitGadget
2022-11-03 3:29 ` [PATCH v5 1/2] merge-tree.c: add --merge-base=<commit> option Kyle Zhao via GitGitGadget
2022-11-03 8:36 ` Ævar Arnfjörð Bjarmason
2022-11-03 9:43 ` [Internet]Re: " kylezhao(赵柯宇)
2022-11-03 3:29 ` [PATCH v5 2/2] merge-tree.c: allow specifying the merge-base when --stdin is passed Kyle Zhao via GitGitGadget
2022-11-03 10:50 ` [PATCH v6 0/2] merge-tree: allow specifying a base commit when --write-tree " Kyle Zhao via GitGitGadget
2022-11-03 10:50 ` [PATCH v6 1/2] merge-tree.c: add --merge-base=<commit> option Kyle Zhao via GitGitGadget
2022-11-03 10:50 ` [PATCH v6 2/2] merge-tree.c: allow specifying the merge-base when --stdin is passed Kyle Zhao via GitGitGadget
2022-11-11 19:44 ` Elijah Newren
2022-11-11 23:45 ` [PATCH v7 0/2] merge-tree: allow specifying a base commit when --write-tree " Kyle Zhao via GitGitGadget
2022-11-11 23:45 ` [PATCH v7 1/2] merge-tree.c: add --merge-base=<commit> option Kyle Zhao via GitGitGadget
2022-11-22 3:04 ` Junio C Hamano
2022-11-22 3:52 ` [Internet]Re: " kylezhao(赵柯宇)
2022-11-22 4:28 ` Junio C Hamano
2022-11-22 5:42 ` Junio C Hamano
2022-11-22 7:47 ` [Internet]Re: " kylezhao(赵柯宇)
2022-11-11 23:45 ` [PATCH v7 2/2] merge-tree.c: allow specifying the merge-base when --stdin is passed Kyle Zhao via GitGitGadget
2022-11-12 0:32 ` [PATCH v7 0/2] merge-tree: allow specifying a base commit when --write-tree " Elijah Newren
2022-11-13 4:53 ` Taylor Blau
2022-11-13 4:54 ` Taylor Blau
2022-11-24 3:37 ` [PATCH v8 0/3] " Kyle Zhao via GitGitGadget
2022-11-24 3:37 ` [PATCH v8 1/3] merge-tree.c: add --merge-base=<commit> option Kyle Zhao via GitGitGadget
2022-11-24 3:37 ` [PATCH v8 2/3] merge-tree.c: allow specifying the merge-base when --stdin is passed Kyle Zhao via GitGitGadget
2022-11-24 3:37 ` [PATCH v8 3/3] docs: fix description of the `--merge-base` option Kyle Zhao via GitGitGadget
2022-11-25 5:28 ` Junio C Hamano
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=db47fbc663eb0f3a1fc9a063dfb1051bc64601af.1667292904.git.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=kylezhao@tencent.com \
--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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).