From patchwork Thu Nov 3 03:29:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kyle Zhao X-Patchwork-Id: 13029470 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 58D73C43219 for ; Thu, 3 Nov 2022 03:30:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231143AbiKCDaA (ORCPT ); Wed, 2 Nov 2022 23:30:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33934 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230320AbiKCD3r (ORCPT ); Wed, 2 Nov 2022 23:29:47 -0400 Received: from mail-wr1-x429.google.com (mail-wr1-x429.google.com [IPv6:2a00:1450:4864:20::429]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E4AA9140EA for ; Wed, 2 Nov 2022 20:29:45 -0700 (PDT) Received: by mail-wr1-x429.google.com with SMTP id bs21so850173wrb.4 for ; Wed, 02 Nov 2022 20:29:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=6pVPGZFb7H8QxA4n8LkcWizmxr0DJDRLMSI4On+P+LY=; b=NgUrQJjNqYsNLqmp8Y1SAVyq53lTj2eRH07vN0zEWfXESRGsaJ5JR8Msr3qnjHfqJT p/B4krqL49t2HyTjSSw+uuHodqt9xJb/3WOiN6Ikv6rdJDCYCou8UpW5FLnGP0o+M+Em GrdId2+QQPjwWEgOdo7oghRDUKn1rzKR3RDOm0CpkoMdgTSzTMRbowQXpKQEkQ19u/2i YKlXiuo5+AiiwehbbMtSDrxfOaD0rge5L+8aQ0q9gSEfGuaQJ0uO825UZ/u3PpRLT5Wk pALdffzo7zWIxGoKvy8haoI0hUvlKB5xZ75psv4TbW4LU4R8bd+FveBnPPL+ePIiB+tJ FU9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6pVPGZFb7H8QxA4n8LkcWizmxr0DJDRLMSI4On+P+LY=; b=cHMD1xDO/RgNEJeZHVFC8efTn2M0zh21qhOWMyM33AXjDrbKbVd39Pk90WReHLPosj rDqIk/iB+ia3xEXqO+6Gx/Jc6d+Fg5CQDq0YClKWm2iwmDqyfo2ipZp3WEeM7EidIgb5 nj5csolUXnGQ4oYPWuMeat8gN3WFOr31WjUbQ7XlqogOsd4Dv0r6GaI+DQuxgQ1HZO20 6NpP1v7axOtByRYo02n9lt1b2V8YmLWcYOazj9lTFWsmX+tt0iChp37w1tPe7ZEhT+0O 53O00E0RR66Cvhpb+3fLcde6r3SfeEffK8czNlgliubu066k0m1xwyr8feQyXfd3B1Ur EwDw== X-Gm-Message-State: ACrzQf1bY61asgYGFklM0HaCi3Q5+aBzUlypqnKZqZZkW5BhPF6LKDyL KkC/3gCz5KmuyGUI1ViZ3FnAuB97fak= X-Google-Smtp-Source: AMsMyM5Ji85fUygydOC0bgZNWQ9vPFvuXkCR1YVTZp10LIYD4yLFkCQJ07JTFgUiKNSAeIE/SDiL9w== X-Received: by 2002:a05:6000:1887:b0:236:7b1a:b14c with SMTP id a7-20020a056000188700b002367b1ab14cmr17335405wri.173.1667446184265; Wed, 02 Nov 2022 20:29:44 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id bd12-20020a05600c1f0c00b003c6bbe910fdsm4006233wmb.9.2022.11.02.20.29.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Nov 2022 20:29:43 -0700 (PDT) Message-Id: <01df0d1a6a7319beada3a3a94b8e36818be2a4d2.1667446182.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Thu, 03 Nov 2022 03:29:41 +0000 Subject: [PATCH v5 1/2] merge-tree.c: add --merge-base= option Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Elijah Newren , kylezhao , Taylor Blau , Kyle Zhao , Kyle Zhao Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Kyle Zhao From: Kyle Zhao This patch will give our callers more flexibility to use `git merge-tree`, such as: git merge-tree --write-tree --merge-base=branch^ HEAD branch This does a merge of HEAD and branch, but uses branch^ as the merge-base. And the reason why using an option flag instead of a positional argument is to allow additional commits passed to merge-tree to be handled via an octopus merge in the future. Signed-off-by: Kyle Zhao --- Documentation/git-merge-tree.txt | 4 +++ builtin/merge-tree.c | 46 ++++++++++++++++++++++++-------- t/t4301-merge-tree-write-tree.sh | 30 +++++++++++++++++++++ 3 files changed, 69 insertions(+), 11 deletions(-) diff --git a/Documentation/git-merge-tree.txt b/Documentation/git-merge-tree.txt index 04bcc416e6e..d9dacb2ce54 100644 --- a/Documentation/git-merge-tree.txt +++ b/Documentation/git-merge-tree.txt @@ -64,6 +64,10 @@ OPTIONS share no common history. This flag can be given to override that check and make the merge proceed anyway. +--merge-base=:: + Instead of finding the merge-bases for and , + specify a merge-base for the merge. + [[OUTPUT]] OUTPUT ------ diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c index fe853aa8f91..62c6d43cdb9 100644 --- a/builtin/merge-tree.c +++ b/builtin/merge-tree.c @@ -3,6 +3,7 @@ #include "tree-walk.h" #include "xdiff-interface.h" #include "help.h" +#include "commit.h" #include "commit-reach.h" #include "merge-ort.h" #include "object-store.h" @@ -406,6 +407,7 @@ struct merge_tree_options { }; static int real_merge(struct merge_tree_options *o, + const char *merge_base, const char *branch1, const char *branch2, const char *prefix) { @@ -432,16 +434,31 @@ static int real_merge(struct merge_tree_options *o, opt.branch1 = branch1; opt.branch2 = branch2; - /* - * Get the merge bases, in reverse order; see comment above - * merge_incore_recursive in merge-ort.h - */ - merge_bases = get_merge_bases(parent1, parent2); - if (!merge_bases && !o->allow_unrelated_histories) - die(_("refusing to merge unrelated histories")); - merge_bases = reverse_commit_list(merge_bases); + if (merge_base) { + struct commit *base_commit; + struct tree *base_tree, *parent1_tree, *parent2_tree; + + base_commit = lookup_commit_reference_by_name(merge_base); + if (!base_commit) + die(_("could not lookup commit %s"), merge_base); + + opt.ancestor = merge_base; + base_tree = get_commit_tree(base_commit); + parent1_tree = get_commit_tree(parent1); + parent2_tree = get_commit_tree(parent2); + merge_incore_nonrecursive(&opt, base_tree, parent1_tree, parent2_tree, &result); + } else { + /* + * Get the merge bases, in reverse order; see comment above + * merge_incore_recursive in merge-ort.h + */ + merge_bases = get_merge_bases(parent1, parent2); + if (!merge_bases && !o->allow_unrelated_histories) + die(_("refusing to merge unrelated histories")); + merge_bases = reverse_commit_list(merge_bases); + merge_incore_recursive(&opt, merge_bases, parent1, parent2, &result); + } - merge_incore_recursive(&opt, merge_bases, parent1, parent2, &result); if (result.clean < 0) die(_("failure to merge")); @@ -487,6 +504,7 @@ int cmd_merge_tree(int argc, const char **argv, const char *prefix) struct merge_tree_options o = { .show_messages = -1 }; int expected_remaining_argc; int original_argc; + const char *merge_base = NULL; const char * const merge_tree_usage[] = { N_("git merge-tree [--write-tree] [] "), @@ -515,6 +533,10 @@ int cmd_merge_tree(int argc, const char **argv, const char *prefix) &o.use_stdin, N_("perform multiple merges, one per line of input"), PARSE_OPT_NONEG), + OPT_STRING(0, "merge-base", + &merge_base, + N_("commit"), + N_("specify a merge-base for the merge")), OPT_END() }; @@ -529,6 +551,8 @@ 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 is incompatible with --stdin")); line_termination = '\0'; while (strbuf_getline_lf(&buf, stdin) != EOF) { struct strbuf **split; @@ -538,7 +562,7 @@ int cmd_merge_tree(int argc, const char **argv, const char *prefix) if (!split[0] || !split[1] || split[2]) die(_("malformed input line: '%s'."), buf.buf); strbuf_rtrim(split[0]); - result = real_merge(&o, split[0]->buf, split[1]->buf, prefix); + result = real_merge(&o, merge_base, split[0]->buf, split[1]->buf, prefix); if (result < 0) die(_("merging cannot continue; got unclean result of %d"), result); strbuf_list_free(split); @@ -581,7 +605,7 @@ int cmd_merge_tree(int argc, const char **argv, const char *prefix) /* Do the relevant type of merge */ if (o.mode == MODE_REAL) - return real_merge(&o, argv[0], argv[1], prefix); + return real_merge(&o, merge_base, argv[0], argv[1], prefix); else return trivial_merge(argv[0], argv[1], argv[2]); } diff --git a/t/t4301-merge-tree-write-tree.sh b/t/t4301-merge-tree-write-tree.sh index cac85591b52..5b0073d3dcd 100755 --- a/t/t4301-merge-tree-write-tree.sh +++ b/t/t4301-merge-tree-write-tree.sh @@ -860,4 +860,34 @@ test_expect_success '--stdin with both a successful and a conflicted merge' ' test_cmp expect actual ' +# specify merge-base as parent of branch2 +# git merge-tree --write-tree --merge-base=c2 c1 c3 +# Commit c1: add file1 +# Commit c2: add file2 after c1 +# Commit c3: add file3 after c2 +# Expected: add file3, and file2 does NOT appear + +test_expect_success 'specify merge-base as parent of branch2' ' + # Setup + git init base-b2-p && ( + cd base-b2-p && + test_commit c1 file1 && + test_commit c2 file2 && + test_commit c3 file3 + ) && + # Testing + ( + cd base-b2-p && + TREE_OID=$(git merge-tree --write-tree --merge-base=c2 c1 c3) && + + q_to_tab <<-EOF >expect && + 100644 blob $(git rev-parse c1:file1)Qfile1 + 100644 blob $(git rev-parse c3:file3)Qfile3 + EOF + + git ls-tree $TREE_OID >actual && + test_cmp expect actual + ) +' + test_done From patchwork Thu Nov 3 03:29:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kyle Zhao X-Patchwork-Id: 13029471 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AB340C433FE for ; Thu, 3 Nov 2022 03:30:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231174AbiKCDaF (ORCPT ); Wed, 2 Nov 2022 23:30:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33064 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229457AbiKCD3r (ORCPT ); Wed, 2 Nov 2022 23:29:47 -0400 Received: from mail-wr1-x42d.google.com (mail-wr1-x42d.google.com [IPv6:2a00:1450:4864:20::42d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ADB83140EC for ; Wed, 2 Nov 2022 20:29:46 -0700 (PDT) Received: by mail-wr1-x42d.google.com with SMTP id o4so836759wrq.6 for ; Wed, 02 Nov 2022 20:29:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=wL971EsyNhMF0S4tHGcTxVLpvX7OV/46WnknqDT367g=; b=X7JvGF4M+N7OeVAFiEb1LSTVITrfcw4Dt6pfabcWaJ+CckbTYgYFmLWAJTIikCKUfR lkIqz4hV0bBfk+nWFKBGev8z95SY72Ght9VHWJK6xavIsP+Gz+YXNvxQ07W4RIDKC+JT nHfpRQ7qr4xfUwqSVLIn3zlTIRE1qEKXWdLqkAUkSOlC6qJyla53BMdlf930tHzgTROG M1ss19moOMPxiyyTgamoHr/whKxG/MFwzmP7ebyepQTcttb+d2ENzgzSRKepRZN/MWdM S04GAMg4q6Igsae/OZEKsn264nMAJp+ODje9R9KaijWkUQo/UINHhBNSGUuexUEucb9m LwWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=wL971EsyNhMF0S4tHGcTxVLpvX7OV/46WnknqDT367g=; b=SAUnlDRrtQVg7Zo5v16jFDxzJuPExKgz4bUxUx8zoF7/9D+E6A/yQMB0q1q02vS32+ GhzX459CrC16EQd8EnvcJzx2zm8a4A2/QhzjZbGit3oX4nVjcj5lBhDj3P0++LIC04cs ZhBJPuDztTr/2sVqkcLBnrLYgLHwt+672srbNLFfOZNK6Bnjez3+DHrFVemoFLEOlxtp Ik6Dwhad7Ha3FO/joePNidF3BtJckEpH2axTaf2RGQZuoIQET1LccpuqCjGfnSVROyb+ MeKNMNtIGkub9/xqNv358o6Pq5rT173Vlvxeka3d3gOCPTPbqmzf/u804gIAIK39MQH5 oRHQ== X-Gm-Message-State: ACrzQf21R1Y+mzQCBLRT0OhA5cQY0iX6Hs2xuJMw8zXjKJit4oEUg2U8 CTIT4ONXkW//QVAWVms9DcCNHz3tQ8g= X-Google-Smtp-Source: AMsMyM7Ux2l8sIDW6vYClnr5VkRh+O9Mr2UfQ6rWKvSuWGlhx+TSaAeJAKXIMHFYxg9FIA3AU+1qXA== X-Received: by 2002:a05:6000:408b:b0:238:238:513d with SMTP id da11-20020a056000408b00b002380238513dmr1730856wrb.536.1667446185039; Wed, 02 Nov 2022 20:29:45 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id x16-20020a5d4450000000b0022a3a887ceasm14433184wrr.49.2022.11.02.20.29.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Nov 2022 20:29:44 -0700 (PDT) Message-Id: <3bdfad03ccade6527bbe74b62ef166df3fcdc13d.1667446182.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Thu, 03 Nov 2022 03:29:42 +0000 Subject: [PATCH v5 2/2] merge-tree.c: allow specifying the merge-base when --stdin is passed Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Elijah Newren , kylezhao , Taylor Blau , Kyle Zhao , Kyle Zhao Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Kyle Zhao From: Kyle Zhao The previous commit added a `--merge-base` option in order to allow using a specified merge-base for the merge. Extend the input accepted by `--stdin` to also allow a specified merge-base with each merge requested. For example: printf " -- " | git merge-tree --stdin does a merge of b1 and b2, and uses b3 as the merge-base. Signed-off-by: Kyle Zhao --- Documentation/git-merge-tree.txt | 14 +++++++++++++- builtin/merge-tree.c | 21 +++++++++++++++++++-- t/t4301-merge-tree-write-tree.sh | 25 +++++++++++++++++++++++++ 3 files changed, 57 insertions(+), 3 deletions(-) diff --git a/Documentation/git-merge-tree.txt b/Documentation/git-merge-tree.txt index d9dacb2ce54..298c133fdb6 100644 --- a/Documentation/git-merge-tree.txt +++ b/Documentation/git-merge-tree.txt @@ -66,7 +66,8 @@ OPTIONS --merge-base=:: Instead of finding the merge-bases for and , - specify a merge-base for the merge. + specify a merge-base for the merge. This option is incompatible + with `--stdin`. [[OUTPUT]] OUTPUT @@ -220,6 +221,17 @@ with linkgit:git-merge[1]: * any messages that would have been printed to stdout (the <>) +INPUT FORMAT +------------ +'git merge-tree --stdin' input format is fully text based. Each line +has this format: + + [ -- ] + +If one line is separated by `--`, the string before the separator is +used for specifying a merge-base for the merge and the string after +the separator describes the branches to be merged. + MISTAKES TO AVOID ----------------- diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c index 62c6d43cdb9..330f779e8bc 100644 --- a/builtin/merge-tree.c +++ b/builtin/merge-tree.c @@ -557,12 +557,29 @@ int cmd_merge_tree(int argc, const char **argv, const char *prefix) while (strbuf_getline_lf(&buf, stdin) != EOF) { struct strbuf **split; int result; + const char *input_merge_base = NULL; 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); + strbuf_rtrim(split[1]); + + /* parse the merge-base */ + if (!strcmp(split[1]->buf, "--")) { + input_merge_base = split[0]->buf; + } + + if (input_merge_base && split[2] && split[3] && !split[4]) { + strbuf_rtrim(split[2]); + strbuf_rtrim(split[3]); + result = real_merge(&o, input_merge_base, split[2]->buf, split[3]->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..03bb1cb8685 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 is incompatible with --stdin" 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,22 @@ test_expect_success 'specify merge-base as parent of branch2' ' ) ' +# 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. + +test_expect_success '--stdin with both a normal merge and a merge-base specified merge' ' + cd base-b2-p && + printf "c1 c3\nc2 -- 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