From patchwork Fri Nov 11 23:45:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kyle Zhao X-Patchwork-Id: 13040959 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 1F932C4332F for ; Fri, 11 Nov 2022 23:45:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234685AbiKKXpY (ORCPT ); Fri, 11 Nov 2022 18:45:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60876 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234681AbiKKXpU (ORCPT ); Fri, 11 Nov 2022 18:45:20 -0500 Received: from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com [IPv6:2a00:1450:4864:20::32a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AE1C66DCD4 for ; Fri, 11 Nov 2022 15:45:18 -0800 (PST) Received: by mail-wm1-x32a.google.com with SMTP id j5-20020a05600c410500b003cfa9c0ea76so4014594wmi.3 for ; Fri, 11 Nov 2022 15:45:18 -0800 (PST) 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=hq6eZ6M+zCnOWlXXSVshTkFTxVr8OezoHYy/O3wJTiA=; b=Dvr7Rs/J4sjqyAMjq8eecOb3SXmT0FUW1VCCB9DsjLJgH0eRz8J1G4KUrLKJ14hzSy TuWaYBeH1eY4Afxtt89jN14ve9eRjIMgIv3WG7F/khsp7a9DS+ecKJ938cJIdSMy/tux CG0jucloP4O3JYSDoSR+7x/zYGl0HSLMRIQB8vsvbRf/ACs74XcPMHSy4RmagHsNB26Q C2Orluw5rZ74Wdh5npu6tRRa5TuHQIxmtzPjXtc7BkI1NibWaW2PTrTJS/cfBsyC7hmU XF3s0AafMu9XPOOVgm7ak7mFFWhTlyrujyhDrZfKhvPjgzkokO34cTctG7iiGiBeztHJ w3Tw== 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=hq6eZ6M+zCnOWlXXSVshTkFTxVr8OezoHYy/O3wJTiA=; b=jVpVn1bPBXMZM4XgNnPiX72Qn5s1V04pCR2e+j7bUVdLaMNs6zzs9bH/svIX23hj+z PliB2S6Lv3kY7IslLoYJrLGhQ6yQ8VGk+AtqrZ98SG5xkpnyDCATf8jjpibnkzNqotPV uWrG0AnoOtFH//n5Q/X9Kpj3qTFg+b2opY3OruMtlSQkWpvdMqmB3+/88ayOWsqfGapG AyZNZEhvRRYxabZSJokqUAb4hqXPMOM2cRjR2Ycs1dU+gv4Qw6dbCkByeenOwFGGtgvL z9rusK0Azp/Gax+egSG3iFh0fWG2m8tO4OGxbmqfAixr8Z7DP8f2JM+JKeMPaR6PW2nc C1TQ== X-Gm-Message-State: ANoB5pk9/eB1dip7u2ui6JJ2QuusHpLWRu6YiXzCVaLCL7lO6TJ2F/V+ jnewDrZ//HZl8emcA5W0cZilU2LFaYE= X-Google-Smtp-Source: AA0mqf4K6Sn3iFuUhIxb97Qg2ykPgZqyTAVvmFtQ3iIvO+Ts/LXvy6EjvG2KK/lJNlTNGoO+0lZ04A== X-Received: by 2002:a05:600c:689a:b0:3cf:5731:53db with SMTP id fn26-20020a05600c689a00b003cf573153dbmr2660521wmb.85.1668210317025; Fri, 11 Nov 2022 15:45:17 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id g9-20020a05600c310900b003a2f2bb72d5sm12948748wmo.45.2022.11.11.15.45.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Nov 2022 15:45:16 -0800 (PST) Message-Id: <1cf1c69b8e8e8e81eccc42b5d8efc605a36ab7eb.1668210314.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Fri, 11 Nov 2022 23:45:13 +0000 Subject: [PATCH v7 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 , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsA==?= Bjarmason , 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 | 27 +++++++++++++++++++ 3 files changed, 66 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..6db96ccbaae 100755 --- a/t/t4301-merge-tree-write-tree.sh +++ b/t/t4301-merge-tree-write-tree.sh @@ -860,4 +860,31 @@ 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 + test_when_finished "rm -rf base-b2-p" && + git init base-b2-p && + test_commit -C base-b2-p c1 file1 && + test_commit -C base-b2-p c2 file2 && + test_commit -C base-b2-p c3 file3 && + + # Testing + TREE_OID=$(git -C base-b2-p merge-tree --write-tree --merge-base=c2 c1 c3) && + + q_to_tab <<-EOF >expect && + 100644 blob $(git -C base-b2-p rev-parse c1:file1)Qfile1 + 100644 blob $(git -C base-b2-p rev-parse c3:file3)Qfile3 + EOF + + git -C base-b2-p ls-tree $TREE_OID >actual && + test_cmp expect actual +' + test_done From patchwork Fri Nov 11 23:45:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kyle Zhao X-Patchwork-Id: 13040960 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 2F104C433FE for ; Fri, 11 Nov 2022 23:45:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234689AbiKKXp0 (ORCPT ); Fri, 11 Nov 2022 18:45:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60878 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234602AbiKKXpV (ORCPT ); Fri, 11 Nov 2022 18:45:21 -0500 Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 947496DCCE for ; Fri, 11 Nov 2022 15:45:19 -0800 (PST) Received: by mail-wr1-x433.google.com with SMTP id g12so8241883wrs.10 for ; Fri, 11 Nov 2022 15:45:19 -0800 (PST) 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=gePnx+tdJ4FcL2JiqcdzEAYDdvSh/EQf3uHbUL1YGRY=; b=ir+UHOyThFWQjPJvdCC74vlJcDXgNmyPQH2oeL+v7cZCU70gROsJu+wrJQw+7Iost8 kjbtQ4rCrbNzqDXSLYbUyAEYBAFMsozKDKLPpbjv6ycRqn5uHviBkboLHkqQwF7IInHX 3O6OCaX2KTGDJgpksBW/mqNpRC0TER2a8imrNHYwwhEz2fPkDQV0W3HNxxeIYh0+goxB F+pRcWtrc0xx+scNxU6qyCFj8bxydPWTGvo4cDnF9m6gonxNOUMa5T1VTC7QssIaPRsq q73yN1P2SXE7cV4s+ovy6TmBstSEAvZ3ONF68FRqDoJHdaAYGfvYaK1YMmXbSK/Q4bGR h1uA== 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=gePnx+tdJ4FcL2JiqcdzEAYDdvSh/EQf3uHbUL1YGRY=; b=dBPZpn2fQSSWeZ2qnQlBXJQdEYFY1jxYxuXTtdMaycuM8gVzEU0OZ+YjZV5nCtEmBp GO9CdxOjJN0pwTBorzi0NilaCdypt93y003Ld6RpQOEcrlC2DvOv/GweE0R52dzIGCUU zPg5Fg9ZCrABvgigVYNJ+egMSJrSGJcUtdnQkJQMERzKG+ehGWXNLH1hw00qaDBuTvlb i546GeFq//gbLqvBziwhyc3VHEfy/wh2sr6rgGma0vCcU2TRYG9fUvMreehAED+OAky9 UrQM7dnWyEHKL8kojVzrQvcxfF4AN3Y2KqLPzYDd5YIv7CXrqJvw9LKUky7fquinSO0B IooQ== X-Gm-Message-State: ANoB5ploAr8SeVt5vyS2X4wRoCoAuQ0DPzHhXwOwY/TciXfbQAwpEhk2 BUbf4Z1LO1F43gRhnFx7/Oq3Pm+0O3o= X-Google-Smtp-Source: AA0mqf6rzuNnXYhbxoFeQLcgXtFuZM1LM55fg9Vz2JnOodizQYXm5tUMlZwbY4IwzrERnJhKFHMn7g== X-Received: by 2002:adf:e0c5:0:b0:236:6f90:3e55 with SMTP id m5-20020adfe0c5000000b002366f903e55mr2435117wri.374.1668210317871; Fri, 11 Nov 2022 15:45:17 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id p2-20020a7bcc82000000b003b50428cf66sm4351802wma.33.2022.11.11.15.45.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Nov 2022 15:45:17 -0800 (PST) Message-Id: <48e55d4e97cfddee25e1cd5dd662c4f93a59b460.1668210315.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Fri, 11 Nov 2022 23:45:14 +0000 Subject: [PATCH v7 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 , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsA==?= Bjarmason , 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 | 35 ++++++++++++++++++++++++++++++++ 3 files changed, 67 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 6db96ccbaae..a8983a0edcb 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 @@ -887,4 +894,32 @@ test_expect_success 'specify merge-base as parent of branch2' ' test_cmp expect actual ' +# Since the earlier tests have verified that individual merge-tree calls +# 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" && + git init repo && + test_commit -C repo c1 && + test_commit -C repo c2 && + test_commit -C repo c3 && + printf "c1 c3\nc2 -- c1 c3\nc2 c3" | git -C repo merge-tree --stdin >actual && + + printf "1\0" >expect && + git -C repo merge-tree --write-tree -z c1 c3 >>expect && + printf "\0" >>expect && + + printf "1\0" >>expect && + git -C repo merge-tree --write-tree -z --merge-base=c2 c1 c3 >>expect && + printf "\0" >>expect && + + printf "1\0" >>expect && + git -C repo merge-tree --write-tree -z c2 c3 >>expect && + printf "\0" >>expect && + + test_cmp expect actual +' + test_done