From patchwork Thu Nov 3 10:50:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kyle Zhao X-Patchwork-Id: 13029883 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 0850EC4332F for ; Thu, 3 Nov 2022 10:50:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230244AbiKCKuc (ORCPT ); Thu, 3 Nov 2022 06:50:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56860 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230199AbiKCKu2 (ORCPT ); Thu, 3 Nov 2022 06:50:28 -0400 Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7A1362628 for ; Thu, 3 Nov 2022 03:50:25 -0700 (PDT) Received: by mail-wr1-x430.google.com with SMTP id y16so2114099wrt.12 for ; Thu, 03 Nov 2022 03:50:25 -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=hq6eZ6M+zCnOWlXXSVshTkFTxVr8OezoHYy/O3wJTiA=; b=CQGcjpcTLALeS5YUHuhUHqqGgTs89rEA3g7k4FJc8g+Bdv/weV/mj9V1j0/C6bzKIi O6Mfn0gkY+bH11fBp+ZJ1QSWvSCUwRwBSypFCZeeLCpOxy+UjiISzz076eyuhaH2OY4W UPWk2icpZp8Rg5OmTHNfr2+7/AhAlmEp0po2tmglA+WJwtpVXWUJs+ahoGIEL80103dO WYMS9lJRXJelJHON3jfx8IExKWrH3jh5QCihhUTyufGD5KIgKTzfTROiuda5D30CFoE6 vmba8Xd2WDCtCEIyoFVaZ87w9b23kTzmTX92XuNeus2/9c55DLMf/v5g1yJf51c5Jciu oICw== 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=gfon7e01XVkJk4R8P23swSOXPHSWYthI6AewoaRGbp1/m9VxJEJMvHzea8errOFcxv ArTMZu4PgpN5X2kRhUH9SxIzVUavSzyYLABEXJfwUnMAbvIzJ3uJontOfnDWjCQLByVv hY7DEYh/oSpOzQFzFeDjbUILESM5Pxr9j1h5A2mR/R0NLBtf6PvNFrBXF0TsG9PBcQR7 1UXsJdUggi2BoEYwofSbN9AzP1ZhxO0BjwEFpCsGb2un0mbqiBq7HMsDe1tJMrX4UXll GRA+QiIwhAusGzHBbetIyQZwFauWelra283+iXIOop26H5ZxZDkFIKSJKKJLpl00F225 i/xg== X-Gm-Message-State: ACrzQf2lU/FMLgDjHfy5gXRcYAn9RoDS7OcWw9n52oQms4FXY8wvB0Y8 FgTzyJ/0JzneXIz6hElBaaCW/H+ZWWg= X-Google-Smtp-Source: AMsMyM5hWWpIo73QQNcOClztjrgskkWg0fI67Z1conck18Fu3NOStdu5GU2KjlmE0GMYIEd8I67hcA== X-Received: by 2002:a5d:4c42:0:b0:236:53d1:e1a9 with SMTP id n2-20020a5d4c42000000b0023653d1e1a9mr18434223wrt.312.1667472623719; Thu, 03 Nov 2022 03:50:23 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id d8-20020adfa408000000b002345cb2723esm636822wra.17.2022.11.03.03.50.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Nov 2022 03:50:23 -0700 (PDT) Message-Id: <1cf1c69b8e8e8e81eccc42b5d8efc605a36ab7eb.1667472621.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Thu, 03 Nov 2022 10:50:20 +0000 Subject: [PATCH v6 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 Thu Nov 3 10:50:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kyle Zhao X-Patchwork-Id: 13029884 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 F0DEEC433FE for ; Thu, 3 Nov 2022 10:50:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230491AbiKCKuf (ORCPT ); Thu, 3 Nov 2022 06:50:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56862 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230233AbiKCKu3 (ORCPT ); Thu, 3 Nov 2022 06:50:29 -0400 Received: from mail-wr1-x42c.google.com (mail-wr1-x42c.google.com [IPv6:2a00:1450:4864:20::42c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7236ADEB9 for ; Thu, 3 Nov 2022 03:50:26 -0700 (PDT) Received: by mail-wr1-x42c.google.com with SMTP id cl5so2123244wrb.9 for ; Thu, 03 Nov 2022 03:50:26 -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=6j6YbjLRw0DZiSswyrRiP+B9r3p2IpYOi+x6huF3xHE=; b=AaG+J0QzR5zV34MfNDssOVwfnBGXXdrrYL3bSe3DF5wLF3dK2+xveMHhTUggJBVv0/ bbJzWRKyifrtXLN2ymleQDZTCuEyVqoEFjPISXXeIPbritE4Lsb2VMUXPklagNDY/J3t yHxdaexjhZW/k5dFIvJqzEUzGf8/PVqqjSCVpqvRz4YKHfQMjc0TNr5/5LPcvixHwXT5 vyUbpeXK31EWolex1V/S7jAPFnFz+z4t9TMAaKYr8KAe9oHCbISw+LsugOgDaACizVId ERIqfkeBgXvqKXRjC6NR/FJ3wcQqxAAGUSJbtPrZzEpHBYgk72zsLF08RDR64z82e359 rTUg== 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=6j6YbjLRw0DZiSswyrRiP+B9r3p2IpYOi+x6huF3xHE=; b=Ppb8DxHP8qoLblTjsXdbVE2kxCZt6VlTXg/V/aEKF7ibLwhNwfYXbjP8XxelWfKmDk krfOWhakgDvnnQDVMW7SoMmh8qF5rlpBRWc+d3WYm6eXGHD0VX+ul1ccVQAGMw88fQ3X Co3DSraUaMG28neABorT7V84AvsrJiY5iZiaH5Yd2QKM/YdXdsUSt1g16TXyDCfD7K7L qblIKLhS2gKKWhYaV6wgSEQZ7whnkng1C8CRy/aCa4IXeZ9bqhZqS/lsJ18OpFl9htg/ j5H5ErJdCiL10N11VPo0rNCRnuZcxkFRvs8jAN5uBvAl5FVOlcdK8kfqLHLYB57EecEE s4ag== X-Gm-Message-State: ACrzQf0CcL6KGT3BrOr3qDHCgTL0Syh1H8gjJI8i0lUrL+Ci5FSN0Wjl mq9P0iR+os+nKOQ0BV18RPtqU9QkWUc= X-Google-Smtp-Source: AMsMyM6KHPfzBTU3v+sRc2fg40TiuBmMNG3Y4LD/mNiyIQPPWfxPzUhGft03AFjUA/vxtuP+SBJZ/g== X-Received: by 2002:adf:f9c9:0:b0:236:9c40:c57c with SMTP id w9-20020adff9c9000000b002369c40c57cmr18222916wrr.47.1667472624792; Thu, 03 Nov 2022 03:50:24 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id d8-20020a05600c34c800b003b476cabf1csm866725wmq.26.2022.11.03.03.50.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Nov 2022 03:50:24 -0700 (PDT) Message-Id: <40d56544e6e319605d02bab743a6e957ff0a5926.1667472621.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Thu, 03 Nov 2022 10:50:21 +0000 Subject: [PATCH v6 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 | 34 ++++++++++++++++++++++++++++++++ 3 files changed, 66 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..22b43f0003e 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,31 @@ 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 test whether +# the input format is available. + +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