From patchwork Tue Jun 22 00:27:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 12336161 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D1D73C4743C for ; Tue, 22 Jun 2021 00:27:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B126B611C1 for ; Tue, 22 Jun 2021 00:27:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230463AbhFVA3g (ORCPT ); Mon, 21 Jun 2021 20:29:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52912 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230481AbhFVA3e (ORCPT ); Mon, 21 Jun 2021 20:29:34 -0400 Received: from mail-oo1-xc31.google.com (mail-oo1-xc31.google.com [IPv6:2607:f8b0:4864:20::c31]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5A4FCC061756 for ; Mon, 21 Jun 2021 17:27:18 -0700 (PDT) Received: by mail-oo1-xc31.google.com with SMTP id b24-20020a4a34180000b029024b199e7d4dso4621312ooa.4 for ; Mon, 21 Jun 2021 17:27:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Q9Un+r4ZONvlb6vx62E8HtR42WCg4M/UJUYRRNng1jc=; b=S9Hbg/hUtRv9yjNo6CXlkikKISJrGZPVGXIXvqcyCep91Icyok9J7VX5abLDcJa2yD YqshGrrwmzRCtcZak3C8J8Fpzi2aC1e1HVB+dKZzLNkY+HfYs0aPl992DxO7TbqFztkS pFlHIO3yyYCgEj1O2bgNrxRJ7uNkEMUjqZEfpxCcnAyLdqtG4ItVKrDGoBa1ugvk/9a7 /27QdrOxeMjCzYub2tIQJf9vjzackFY1OcdirdymVRUMXWUNkl/OgQrKpYxSwoiJfIsp 17T1BB0wyX3bafU9KsRueIKfRculBln95hg/tmyPkywBstVb7PTcJEaPVkxkV+I1qvON /vIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Q9Un+r4ZONvlb6vx62E8HtR42WCg4M/UJUYRRNng1jc=; b=ksWpjBl44uf/lHi3nIpP0hnaSwSXT/NPTsZa7C98lu86BnU9NRg2gBx0aDDiTXdl2k 8w6hUgPqOC4NWbCU5BR60ebTTTtFOCH+gGNMgloJXRqarACAPXrsXjsz/FF8e49OmJ+p PvgscajbbqKdHC4QgNQIhwP0IrueHevKwHBvQiL0LWxaj96v34xB9/BRNhH3lJDyKHzQ iq0ZJrR7gKpwPkwJqDjQL99R2ckoExIbjtAq42i4rxvjacUCdmZa+6jHMKbh/6RdO3vp 7KOfdoeRH9aYiao+kPjeYz/SfsS/EgSAmQ0mRH8Fj6NadiSAjweYJiP+GGAay1Ydm01b cldw== X-Gm-Message-State: AOAM531Q73V0QICgxwnBggGrCSIpZ4dp7oIPXwAfk+U3E4gnWVWPjDlg 1exVuWQJCBF3IePoBz570WCsnZS67yoTwQ== X-Google-Smtp-Source: ABdhPJxQRNtFMM+ApzS0w3dsWAxJhzdXFUPom4aRBB+A9O1oceFBI8/8X9mLdtg5xOAw1kYyP0ZKVA== X-Received: by 2002:a4a:c190:: with SMTP id w16mr742984oop.92.1624321637498; Mon, 21 Jun 2021 17:27:17 -0700 (PDT) Received: from localhost (fixed-187-188-155-231.totalplay.net. [187.188.155.231]) by smtp.gmail.com with ESMTPSA id r7sm344137otn.29.2021.06.21.17.27.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Jun 2021 17:27:17 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Phillip Wood , Eric Sunshine , Felipe Contreras Subject: [PATCH v2 1/4] test: add merge style config test Date: Mon, 21 Jun 2021 19:27:11 -0500 Message-Id: <20210622002714.1720891-2-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210622002714.1720891-1-felipe.contreras@gmail.com> References: <20210622002714.1720891-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org We want to test different combinations of merge.conflictstyle, and a new file is the best place to do that. Signed-off-by: Felipe Contreras --- t/t6440-config-conflict-markers.sh | 37 ++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100755 t/t6440-config-conflict-markers.sh diff --git a/t/t6440-config-conflict-markers.sh b/t/t6440-config-conflict-markers.sh new file mode 100755 index 0000000000..813d7dda9a --- /dev/null +++ b/t/t6440-config-conflict-markers.sh @@ -0,0 +1,37 @@ +#!/bin/sh + +test_description='merge style conflict markers configurations' + +. ./test-lib.sh + +test_expect_success 'merge' ' + test_create_repo merge && + ( + cd merge && + + test_write_lines 1 2 3 >content && + git add content && + git commit -m base && + + git checkout -b r && + echo six >>content && + git commit -a -m right && + + git checkout master && + echo 7 >>content && + git commit -a -m left && + + test_must_fail git merge r && + ! grep "^|||||||" content && + + git reset --hard && + test_must_fail git -c merge.conflictstyle=diff3 merge r && + grep "^|||||||" content && + + git reset --hard && + test_must_fail git -c merge.conflictstyle=merge merge r && + ! grep "^|||||||" content + ) +' + +test_done From patchwork Tue Jun 22 00:27:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 12336163 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A69B0C48BC2 for ; Tue, 22 Jun 2021 00:27:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 833E6611C1 for ; Tue, 22 Jun 2021 00:27:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230526AbhFVA3h (ORCPT ); Mon, 21 Jun 2021 20:29:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52928 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230515AbhFVA3f (ORCPT ); Mon, 21 Jun 2021 20:29:35 -0400 Received: from mail-ot1-x32b.google.com (mail-ot1-x32b.google.com [IPv6:2607:f8b0:4864:20::32b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 94E9AC061574 for ; Mon, 21 Jun 2021 17:27:19 -0700 (PDT) Received: by mail-ot1-x32b.google.com with SMTP id o17-20020a9d76510000b02903eabfc221a9so19642661otl.0 for ; Mon, 21 Jun 2021 17:27:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NDqEm2E2qA0ujhZbG6OpuXTvXRUI80SKfLBuDzOX4KE=; b=m/qVmnb+OAG70WosHch3WP6U65jbAzpCllY3h6nyzWxmVeiq7VxWAFhICJ5K62s3Mp YLiuTvh6y7kTeuHxd+UawksE7v2K2qBl4DCp4CzseE0FAYjXDGaySUkRs5GMBDKXyXFn idsAnAlFcO0VnVb+tgrtESlR25cHBzdSx/UdU7MztJUrwInOuIFeXbwrEbMDcumduAYk NIjye/4pqaA0PQEz68D+ZIk1cXe48uCXKhc4j87aFHncFOJ1f7HhPTKLgf0BrAkhClNR +J1bKy/KTAJxWeGYMn/r6cRURbFKxCIOgCMzdNaToMUwZC1MlY++3+INQYA233CRZb5B XsAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=NDqEm2E2qA0ujhZbG6OpuXTvXRUI80SKfLBuDzOX4KE=; b=Voh/PBW0gBPE86ddPKIpn4N40MIHnlHBcrG9V9ctyrbnXRMfTaz3UgCQjno6y1wXNB ggA06ZEzu0P2D/dmb90IZKKOSOKnkJWjVvopHW5aU4Ts1V7ti6d5kaN3Hj9b8A/m9sCi +sWNpfpbVfzVRgUorfNr8bUPPI0LUMdr8yHjMp4Dinm53Z2OWe/eVdMY07lbmEtf8Bxt DL31ScZF4MN+joE9tHYcGMzACnBE9dW0kEKR0nQPyqybEv89oDtyXQesTYUHZODY/iLF g4/CDcvOObvCsKs1Cw+hU14d/PeHHMa1YypcwmGQEyPRYUsciAPUlkbjsX0OcxL1X5jL WU6g== X-Gm-Message-State: AOAM533ehqPEdFeVZIIivcTVWcsC3K8wL4rjUn/MsoEgDYhDO7tvY6Fw zVlW/2Y5g7ShUBHsyytCjD74VK/NdsK6Bw== X-Google-Smtp-Source: ABdhPJwUCK7B5qzlcMfysmoxqs7vPKPobc62ihY7Cclf/CA81DhF+WKApm0hs30+f6AejY6ET/tjXw== X-Received: by 2002:a9d:6244:: with SMTP id i4mr648835otk.136.1624321638805; Mon, 21 Jun 2021 17:27:18 -0700 (PDT) Received: from localhost (fixed-187-188-155-231.totalplay.net. [187.188.155.231]) by smtp.gmail.com with ESMTPSA id g1sm161187ooi.34.2021.06.21.17.27.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Jun 2021 17:27:18 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Phillip Wood , Eric Sunshine , Felipe Contreras Subject: [PATCH v2 2/4] merge-tree: fix merge.conflictstyle handling Date: Mon, 21 Jun 2021 19:27:12 -0500 Message-Id: <20210622002714.1720891-3-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210622002714.1720891-1-felipe.contreras@gmail.com> References: <20210622002714.1720891-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Currently it's completely ignored. Signed-off-by: Felipe Contreras --- builtin/merge-tree.c | 4 ++++ t/t6440-config-conflict-markers.sh | 21 +++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c index de8520778d..7d677bd75c 100644 --- a/builtin/merge-tree.c +++ b/builtin/merge-tree.c @@ -7,6 +7,8 @@ #include "blob.h" #include "exec-cmd.h" #include "merge-blobs.h" +#include "config.h" +#include "xdiff-interface.h" static const char merge_tree_usage[] = "git merge-tree "; @@ -378,6 +380,8 @@ int cmd_merge_tree(int argc, const char **argv, const char *prefix) if (argc != 4) usage(merge_tree_usage); + git_config(git_xmerge_config, NULL); + buf1 = get_tree_descriptor(r, t+0, argv[1]); buf2 = get_tree_descriptor(r, t+1, argv[2]); buf3 = get_tree_descriptor(r, t+2, argv[3]); diff --git a/t/t6440-config-conflict-markers.sh b/t/t6440-config-conflict-markers.sh index 813d7dda9a..cb2ee3ad0a 100755 --- a/t/t6440-config-conflict-markers.sh +++ b/t/t6440-config-conflict-markers.sh @@ -34,4 +34,25 @@ test_expect_success 'merge' ' ) ' +test_expect_success 'merge-tree' ' + test_create_repo merge-tree && + ( + cd merge-tree && + + test_commit initial initial-file initial && + test_commit r content r && + git reset --hard initial && + test_commit l content l && + + git merge-tree initial r l >actual && + ! grep "^+|||||||" content && + + git -c merge.conflictstyle=diff3 merge-tree initial r l >actual && + grep "^+|||||||" actual && + + git -c merge.conflictstyle=merge merge-tree initial r l >actual && + ! grep "^+|||||||" content + ) +' + test_done From patchwork Tue Jun 22 00:27:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 12336167 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 99F0EC4743C for ; Tue, 22 Jun 2021 00:27:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 763BF611C1 for ; Tue, 22 Jun 2021 00:27:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231132AbhFVA3i (ORCPT ); Mon, 21 Jun 2021 20:29:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52930 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230479AbhFVA3g (ORCPT ); Mon, 21 Jun 2021 20:29:36 -0400 Received: from mail-ot1-x334.google.com (mail-ot1-x334.google.com [IPv6:2607:f8b0:4864:20::334]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C0C67C061756 for ; Mon, 21 Jun 2021 17:27:20 -0700 (PDT) Received: by mail-ot1-x334.google.com with SMTP id i12-20020a05683033ecb02903346fa0f74dso19558478otu.10 for ; Mon, 21 Jun 2021 17:27:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=v7a5aerGceyi/ZsHtZCAwJjuIr81Nv0H/XOrOc//1EA=; b=broq1G3LHFPghWtcyvmC0eiV/d78xTHb1kt10M/uciQfc3EmZcqhCBXs1HpxmtQ9F2 pD5AtBnL+UVY7HoeIltKq3K+7LINMM54OdRV54f+MF6bfqlU2qnusgMP/FWoMPIm7doV DSn7B6YTbaBzC9T5bZ0j/nZOxniGdhiDEQEXo5Aok84p+JJNv/LUWMNHH+jgey72Rhom vWtoUxhCVUlDX5G0mtRZjPyCD5ksfQZ+Tn886RHB0C0EKsNgw/SKwMnAn3QVDRKCMful gW+TCudrmsRL7Ea32JYLXQx9g711Tyga3p5iSb73bLILLYlhV+6ZMV5HgktJL+etUpyO vqkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=v7a5aerGceyi/ZsHtZCAwJjuIr81Nv0H/XOrOc//1EA=; b=jq4JIKq8g8emDaRYxqjAu4DZqPSjVG2EZJBt8aY/VeGKOrn6lDo4L1tkXvugAxhOly oNAfo3kMzE1TXQx24n3Fzz98L7K5uxbqi08CDss9yXK5JOrXPUdjb8Q3fJzNHBCJNTRa kj23xL3MhHbE8WCb1kLBEzq2dvTXbGOBA5RSWJehNRAvXWmrHgg94SYSNBUBaGZ9FzbR o7UZtYAeEWIfK/9s65yxdt6dKuJ9j65HqSwWpBej+tfWA3p2d/VOj23NKu7T0DV7/Vgp krjR7mX4eoK4NdDo2yx2wzBc+GE0zKjwV/KnYZFKKbup8Pp18dwW5Id6GbiRWW45xUUt iPdA== X-Gm-Message-State: AOAM5303hL3ubTDbJNy2kjqMGmNzA9s1yJy48xx1O9eTzFwMgy9m3dY0 18oozvucUWCpCMRDDZA18NrRHsQZGsOD5g== X-Google-Smtp-Source: ABdhPJyNU30D77NCeHtFkFZFlCG8YF4reae7bLmoW4cLEX0KBsjWzBFjgNAGG4WmRU+Y5rUxEq7LzQ== X-Received: by 2002:a9d:5381:: with SMTP id w1mr630328otg.259.1624321639981; Mon, 21 Jun 2021 17:27:19 -0700 (PDT) Received: from localhost (fixed-187-188-155-231.totalplay.net. [187.188.155.231]) by smtp.gmail.com with ESMTPSA id w5sm1590974oiv.7.2021.06.21.17.27.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Jun 2021 17:27:19 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Phillip Wood , Eric Sunshine , Felipe Contreras Subject: [PATCH v2 3/4] notes: fix merge.conflictstyle handling Date: Mon, 21 Jun 2021 19:27:13 -0500 Message-Id: <20210622002714.1720891-4-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210622002714.1720891-1-felipe.contreras@gmail.com> References: <20210622002714.1720891-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Currently it's completely ignored. Signed-off-by: Felipe Contreras --- builtin/notes.c | 3 ++- t/t6440-config-conflict-markers.sh | 27 +++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/builtin/notes.c b/builtin/notes.c index 74bba39ca8..a333cc68ec 100644 --- a/builtin/notes.c +++ b/builtin/notes.c @@ -23,6 +23,7 @@ #include "notes-merge.h" #include "notes-utils.h" #include "worktree.h" +#include "xdiff-interface.h" static const char * const git_notes_usage[] = { N_("git notes [--ref ] [list []]"), @@ -1000,7 +1001,7 @@ int cmd_notes(int argc, const char **argv, const char *prefix) OPT_END() }; - git_config(git_default_config, NULL); + git_config(git_xmerge_config, NULL); argc = parse_options(argc, argv, prefix, options, git_notes_usage, PARSE_OPT_STOP_AT_NON_OPTION); diff --git a/t/t6440-config-conflict-markers.sh b/t/t6440-config-conflict-markers.sh index cb2ee3ad0a..c51512ced6 100755 --- a/t/t6440-config-conflict-markers.sh +++ b/t/t6440-config-conflict-markers.sh @@ -55,4 +55,31 @@ test_expect_success 'merge-tree' ' ) ' +test_expect_success 'notes' ' + test_create_repo notes && + ( + test_commit initial && + + git -c core.notesRef=refs/notes/b notes add -m b initial && + + git update-ref refs/notes/r refs/notes/b && + git -c core.notesRef=refs/notes/r notes add -f -m r initial && + + git update-ref refs/notes/l refs/notes/b && + git config core.notesRef refs/notes/l && + git notes add -f -m l initial && + + test_must_fail git notes merge r && + ! grep "^|||||||" .git/NOTES_MERGE_WORKTREE/* && + + git notes merge --abort && + test_must_fail git -c merge.conflictstyle=diff3 notes merge r && + grep "^|||||||" .git/NOTES_MERGE_WORKTREE/* && + + git notes merge --abort && + test_must_fail git -c merge.conflictstyle=merge notes merge r && + ! grep "^|||||||" .git/NOTES_MERGE_WORKTREE/* + ) +' + test_done From patchwork Tue Jun 22 00:27:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 12336165 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A818DC48BC2 for ; Tue, 22 Jun 2021 00:27:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8A59A6128A for ; Tue, 22 Jun 2021 00:27:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231185AbhFVA3j (ORCPT ); Mon, 21 Jun 2021 20:29:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52928 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231129AbhFVA3i (ORCPT ); Mon, 21 Jun 2021 20:29:38 -0400 Received: from mail-oi1-x230.google.com (mail-oi1-x230.google.com [IPv6:2607:f8b0:4864:20::230]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 158BFC061574 for ; Mon, 21 Jun 2021 17:27:22 -0700 (PDT) Received: by mail-oi1-x230.google.com with SMTP id d19so21898303oic.7 for ; Mon, 21 Jun 2021 17:27:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=RgZNj90QvPp5WheG0qBuoQCj6QlsOtSkGCI90a1D3sU=; b=Oev5gjNZHgNzlMfqE9K/mwcz50aYm91qbMvc9K1A7ldTF0CTAyU5QWyhfvieSNtONg YHfZTjfV/53EN1cXXyFG1mEO2TrcE5bVZ2iEaZaBR/IRY568ganCziDH5WuIxR/RNmGl Q1UHGdgxCeVEn/y8tCbIt0p43pXdib0/3keH20q8K+u6mrCbcAVSvibFAv3s7IJELOEF dQMWYbmxAiQm6KOoIBAQmFAufa2OgctyWtd/xb5xcn2v1Tbkf8CDrkve8hdsmifHsK9y Yap1zZBe22XFVRYP/icOf4ccSfxFVFbRhCk+wbXUxB2aO114ItZICdSfA8No1FYv2WCm mlNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=RgZNj90QvPp5WheG0qBuoQCj6QlsOtSkGCI90a1D3sU=; b=Ry6tKiacKKXoSZoDJRZuRH1AL+KfkbhAsVeP+7EVX/cNQQKyAvBGn5tL9aN3hk1CX+ /HcIGAakQ3a3MK1RN99a2dnNGlJjBkx+As9r0JjK5Nbp/gsyf2ShuBa2Xyk2BLCpKRI6 0+j3AOEzSbvsB0JxzIZNATAiK1onYPoQwZeADXgERZWco1ZOkaFaKW6+hi9QM6C0mTq8 5IMN2XBf9ok5TbLRwQushY1nClQKXAC13vgLSBl+7hGfj7E8rj+pwJYm5W07pTmxFSTg 47fxWzGoJ+6I2iH47JNOMmBGGDjU01KI+YJ1iuMExTo5qZfe2MB7mGYX84m4SBVOKHRZ E11g== X-Gm-Message-State: AOAM5308Mm8Qp6Pc6PUkrxy8FfKdLiPHiV/8lq9QRJTq+RWXfa2qPzT3 olQOCh+47gCi9ELoZh26dXausWHXcrA5Bw== X-Google-Smtp-Source: ABdhPJyanQpxNX1h6zYdBRKL5CeB6b5zs8HT6zPMYKWZXZz6+lPkuz0OU67uIa5cq81ja9wtiWwehg== X-Received: by 2002:a05:6808:1315:: with SMTP id y21mr1060086oiv.44.1624321641085; Mon, 21 Jun 2021 17:27:21 -0700 (PDT) Received: from localhost (fixed-187-188-155-231.totalplay.net. [187.188.155.231]) by smtp.gmail.com with ESMTPSA id q26sm165882ood.7.2021.06.21.17.27.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Jun 2021 17:27:20 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Phillip Wood , Eric Sunshine , Felipe Contreras Subject: [PATCH v2 4/4] test: document broken merge.conflictStyle handling Date: Mon, 21 Jun 2021 19:27:14 -0500 Message-Id: <20210622002714.1720891-5-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210622002714.1720891-1-felipe.contreras@gmail.com> References: <20210622002714.1720891-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Currently both merge.conflictStyle and --conflict=diff3 don't work together for `git commit --merge`, since the former wrongly overrides the later. There is no easy way to fix this, so mark it as broken for now. Signee-off-by: Felipe Contreras --- t/t6440-config-conflict-markers.sh | 31 ++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/t/t6440-config-conflict-markers.sh b/t/t6440-config-conflict-markers.sh index c51512ced6..3ba993a6a8 100755 --- a/t/t6440-config-conflict-markers.sh +++ b/t/t6440-config-conflict-markers.sh @@ -82,4 +82,35 @@ test_expect_success 'notes' ' ) ' +test_expect_failure 'checkout' ' + test_create_repo checkout && + ( + test_commit checkout && + + test_write_lines a b c d e >content && + git add content && + git commit -m initial && + + git checkout -b simple master && + test_write_lines a c e >content && + git commit -a -m simple && + + test_write_lines b d >content && + git checkout --merge master && + ! grep "^|||||||" content && + + git config merge.conflictstyle merge && + + git checkout -f simple && + test_write_lines b d >content && + git checkout --merge --conflict=diff3 master && + grep "^|||||||" content && + + git checkout -f simple && + test_write_lines b d >content && + git checkout --merge --conflict=merge master && + ! grep "^|||||||" content + ) +' + test_done