From patchwork Tue Nov 1 08:55:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kyle Zhao X-Patchwork-Id: 13026741 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 7255AFA3745 for ; Tue, 1 Nov 2022 08:55:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229933AbiKAIzN (ORCPT ); Tue, 1 Nov 2022 04:55:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39674 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229910AbiKAIzL (ORCPT ); Tue, 1 Nov 2022 04:55:11 -0400 Received: from mail-wr1-x435.google.com (mail-wr1-x435.google.com [IPv6:2a00:1450:4864:20::435]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8512B17E23 for ; Tue, 1 Nov 2022 01:55:08 -0700 (PDT) Received: by mail-wr1-x435.google.com with SMTP id h9so19261161wrt.0 for ; Tue, 01 Nov 2022 01:55:08 -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=GKKfKMtObsoOSCMU+7kRFCLLKZOAgOKeZVeBtQqLUFc=; b=ASPvDYkUmqHhc6PbkXrtP3QcTVsG6nUP6n8YgRdoR8L2HkDSFI6p3DYgRR3543/YlT hEw507eWgl2pmfGpK5F3gV/ayKDS1vZKoHdIAvxIayf+1saZaqz50/eWegse53XVOrJQ zV/YNRR1j3tm59rV2f/0m4RCk5rhoLFVsGSn636pjNeu1wzc1NVg0SC5Pw3nQlXSQr9s 1w86n0mWM98odRRk88QXqvLzFwSkl5TrGCuPRiC6c9gnW8O5AF+aOion/kVMY9HV9Jv8 zFi4ty39iGYqT8kRBOt41TL2nq8ct2JXL+s7/owMHuyxe0p++WmVlQZ491kkhaqheWgc B5og== 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=GKKfKMtObsoOSCMU+7kRFCLLKZOAgOKeZVeBtQqLUFc=; b=zuB0YncBJMuV0WH4J00D5q5+TGyQAmdAYYwZnyJwCkoUh22me809qqR0M+PGD4RvqF y3Tt0Bg3snNoaDiIk5BHqN0gBicHLNW5X/DYvEkbAeOmaOu+Uu0REd4bZYA3pHb95ywp t9/bPhjKntLcUKX+neEGVaJMIDH21gCqPDpUujbs/W17dsmzHWcU5ICX3/qCkl2qK54m wCYcHf/++6Wz1stDdCdpW6zoPZefh2pINiajn8VmTCL5ygwjmIwhW5QYsh0bgmIgwhLZ NzZ10lwi866AM5xPYpj+erX23SnkpqH2gmU9c/R5xSTfOpaOd/raTkGlWzP35HyZlo/U 6K4g== X-Gm-Message-State: ACrzQf3JshcP9uvWfFnI2+mdy+gIHms7h8X7NrQCBLRhBsVC9DGZsGTj rBcq1Ox90Kq/pDpX9qdj90PbGWXjeDc= X-Google-Smtp-Source: AMsMyM6WSX52QQiFSn1eeEOAUeHDntBJx7C1iYl85WmTe02IhoAHlaWYNxw8ubHGIurKrUYiXHhX8g== X-Received: by 2002:adf:e603:0:b0:236:80ac:5f4b with SMTP id p3-20020adfe603000000b0023680ac5f4bmr10528616wrm.83.1667292906754; Tue, 01 Nov 2022 01:55:06 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id v11-20020a05600c444b00b003c70191f267sm10024894wmn.39.2022.11.01.01.55.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Nov 2022 01:55:06 -0700 (PDT) Message-Id: In-Reply-To: References: Date: Tue, 01 Nov 2022 08:55:03 +0000 Subject: [PATCH v4 1/2] merge-tree.c: add --merge-base= option Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Elijah Newren , kylezhao , 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 | 44 ++++++++++++++++++++++++-------- t/t4301-merge-tree-write-tree.sh | 30 ++++++++++++++++++++++ 3 files changed, 67 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..f402b807c0f 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() }; @@ -538,7 +560,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 +603,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 Tue Nov 1 08:55:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kyle Zhao X-Patchwork-Id: 13026742 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 BD3D5FA3743 for ; Tue, 1 Nov 2022 08:55:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229930AbiKAIzM (ORCPT ); Tue, 1 Nov 2022 04:55:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39666 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229457AbiKAIzK (ORCPT ); Tue, 1 Nov 2022 04:55:10 -0400 Received: from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com [IPv6:2a00:1450:4864:20::32e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6992217E25 for ; Tue, 1 Nov 2022 01:55:09 -0700 (PDT) Received: by mail-wm1-x32e.google.com with SMTP id fn7-20020a05600c688700b003b4fb113b86so9496334wmb.0 for ; Tue, 01 Nov 2022 01:55:09 -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=7j4pK/twic9MZEd7id4p6fJ/0t3Ay1LH6QdY2JBBK6g=; b=lK1WqeJhDoRBFXH926AYLa9Zc4SYFQ84f2A70DudeVqrk0sE7kvfwrlG+NLvTzcOAv +fsCmc/WZv7u/E0+G0G4uY3Uf1nsYlM3f+JaX7410Np3IDmQ/+6co3YcCVMtlPAJ+WtF 7CiwCH2DQsZZgnYlLWuVh+fOCMPx0DAxOnSZipVFqOb3eDrq2pVpEB4WhuW0LHYRwxws Ln5auZlxF3vwMKMBA60BSdEeR8ZErTUKkHbNg7FXlN8pZdo1dgruWihRfRg/k6MFw+b1 +Mtq2PWcRN+1vi0jXKGeRCQrqL96Gl9L73k+FvzHwfVFE4TNhsX+M1t23QdjhWGGdO7l fy9Q== 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=7j4pK/twic9MZEd7id4p6fJ/0t3Ay1LH6QdY2JBBK6g=; b=ScVgc1aecEEdpqc11eS3cVF7gKcqVmzg4PpTO5LjwyxxZYCClfXvvLEFjH1en28Xhe crwkMtlfsG5OMDBe++hCYrJsAjzUfGTAp26zJ6F0Z/E4SYZsVatQofeZ/g9dLuU5jY8k OWPeHVphsuvpmwfAifK/rG6fK5ltU2hTSQVSF7LmNrTIAVgj/GcAZWqVx0RQvmO6dp0T 4OsLJQErfhcrkDrJlh1f9jsuUxNi9F7BcMnMAobNIqp29XQYGSc5cjcgx71hVwNdGEYw rX/48nb8cn1Rh8Nrp7RH2Of/8X2dLuRGXQcgozHjBSs9By3USXEQCWs+TFdkBhDE45qb pxOA== X-Gm-Message-State: ACrzQf2GmonMe8wqkfSeeQVBwPSTJXSR/cxLYpbAuJzxh8DVo34OCAZS Z3bmVG6aG3ziKKdXzyLKrTAy9LZeOMA= X-Google-Smtp-Source: AMsMyM6yBucLRx6wQNih+b20M55zGTXn/yep6PRhYVVJFMpcm4TWhtshk52kJyNv0214LNm07hDmAA== X-Received: by 2002:a05:600c:21d7:b0:3cf:7d8a:42e2 with SMTP id x23-20020a05600c21d700b003cf7d8a42e2mr1889191wmj.202.1667292907648; Tue, 01 Nov 2022 01:55:07 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id i10-20020adffdca000000b00236674840e9sm9395629wrs.59.2022.11.01.01.55.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Nov 2022 01:55:07 -0700 (PDT) Message-Id: In-Reply-To: References: Date: Tue, 01 Nov 2022 08:55:04 +0000 Subject: [PATCH v4 2/2] merge-tree.c: support --merge-base in conjunction with --stdin Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Elijah Newren , kylezhao , Kyle Zhao , Kyle Zhao Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Kyle Zhao From: Kyle Zhao 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= " | git merge-tree --stdin This does a merge of b1 and b2, and uses b3 as the merge-base. Signed-off-by: Kyle Zhao --- 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=:: Instead of finding the merge-bases for and , - 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= 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