From: "Kyle Zhao via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: "Elijah Newren" <newren@gmail.com>,
kylezhao <kylezhao@tencent.com>, "Taylor Blau" <me@ttaylorr.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Kyle Zhao" <kylezhao@tencent.com>
Subject: [PATCH v7 0/2] merge-tree: allow specifying a base commit when --write-tree is passed
Date: Fri, 11 Nov 2022 23:45:12 +0000 [thread overview]
Message-ID: <pull.1397.v7.git.1668210314.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.1397.v6.git.1667472621.gitgitgadget@gmail.com>
Thanks for everyone's careful reviews.
In this patch, I introduce a new --merge-base=<commit> option to allow
callers to specify a merge-base for the merge and extend the input accepted
by --stdin to also allow a specified merge-base with each merge requested.
Regards, Kyle
Changes since v1:
* Changed merge_incore_recursive() to merge_incore_nonrecursive() when
merge-base is specified.
* Fixed c style problem.
* Moved commit lookup/die logic out to the parsing logic in
cmd_merge_tree().
* use test_commit for test
Changes since v2:
* commit message
* Rebased on top of en/merge-tree-sequence.
* Set opt.ancestor to o->merge_base. Because opt.ancestor is a *char. To
make it easier to pass parameters, I moved
lookup_commit_reference_by_name() to real_ merge() again.
* Added test comment.
Changes since v3:
* support --merge-base in conjunction with --stdin
Changes since v4:
* commit message
* added input format document
* changed the input format for specifying the merge-base when --stdin is
passed
* changed the output when --stdin and --merge-base are used at the same
time
* add comment for test
Changes since v5:
* improved test: remove the test repo after the test; avoid sub-shell.
Changes since v6:
* fixed comment of test
Kyle Zhao (2):
merge-tree.c: add --merge-base=<commit> option
merge-tree.c: allow specifying the merge-base when --stdin is passed
Documentation/git-merge-tree.txt | 16 ++++++++
builtin/merge-tree.c | 65 ++++++++++++++++++++++++++------
t/t4301-merge-tree-write-tree.sh | 62 ++++++++++++++++++++++++++++++
3 files changed, 131 insertions(+), 12 deletions(-)
base-commit: ec1edbcb56ac05e9980299b05924c5c1b51d68b4
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1397%2Fkeyu98%2Fkz%2Fmerge-tree-option-merge-base-v7
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1397/keyu98/kz/merge-tree-option-merge-base-v7
Pull-Request: https://github.com/gitgitgadget/git/pull/1397
Range-diff vs v6:
1: 1cf1c69b8e8 = 1: 1cf1c69b8e8 merge-tree.c: add --merge-base=<commit> option
2: 40d56544e6e ! 2: 48e55d4e97c merge-tree.c: allow specifying the merge-base when --stdin is passed
@@ t/t4301-merge-tree-write-tree.sh: test_expect_success 'specify merge-base as par
'
+# Since the earlier tests have verified that individual merge-tree calls
-+# are doing the right thing, this test case is only used to test whether
-+# the input format is available.
++# are doing the right thing, this test case is only used to verify that
++# we can also trigger merges via --stdin, and that when we do we get
++# the same answer as running a bunch of separate merges.
+
+test_expect_success 'check the input format when --stdin is passed' '
+ test_when_finished "rm -rf repo" &&
--
gitgitgadget
next prev parent reply other threads:[~2022-11-11 23:45 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 ` [PATCH v4 2/2] merge-tree.c: support --merge-base in conjunction with --stdin Kyle Zhao via GitGitGadget
2022-11-03 1:13 ` 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 ` Kyle Zhao via GitGitGadget [this message]
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=pull.1397.v7.git.1668210314.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=kylezhao@tencent.com \
--cc=me@ttaylorr.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).