From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS3215 2.6.0.0/16 X-Spam-Status: No, score=-3.4 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by dcvr.yhbt.net (Postfix) with ESMTP id 27DA61F72C for ; Sat, 18 Jun 2022 00:22:15 +0000 (UTC) Authentication-Results: dcvr.yhbt.net; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="R28rqkEw"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1383737AbiFRAVi (ORCPT ); Fri, 17 Jun 2022 20:21:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43632 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1383705AbiFRAVS (ORCPT ); Fri, 17 Jun 2022 20:21:18 -0400 Received: from mail-wm1-x332.google.com (mail-wm1-x332.google.com [IPv6:2a00:1450:4864:20::332]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 520E75A2C2 for ; Fri, 17 Jun 2022 17:21:14 -0700 (PDT) Received: by mail-wm1-x332.google.com with SMTP id q15so3001392wmj.2 for ; Fri, 17 Jun 2022 17:21:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=hiORs4e9DkzNUZHgsiWSwsPhsPUCvMsvR9nowMjv0Z8=; b=R28rqkEwDTi5dJTfN9CozNA25LVl7R0XzbWjNEKkrbLMbNol6IPrUv9xFcbThapdqV 5WbkHQ35XfXynxV1zrT1AclKY2gFbV/Upg9vF6lV0jNlguUFgCm7ie1Wu4368t7cDE8s Oo8Nn0gBISAVIgXdYW9ylYlYL3U3UHYKlfcSz9tOivV2ZRGU5gHljAjDpTYigDLuBDXp d0ssTZ2VAq3h2zX58Nx4fDTsl1piDwGGqB+yBmrJeCf/TtdSqjArnP6ckW2uCoC6DLt+ j6VD9kdd7RppWmyHJB79vxv+LVEpXddePACzlC4TW9ux1Q4ijeEtw4qHX4bCvPLoK85N 1tSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=hiORs4e9DkzNUZHgsiWSwsPhsPUCvMsvR9nowMjv0Z8=; b=GQF88RwUdcc7PobK3ajf0kjIbD6enIeyTDXUvaIkCJHdXj9xHbZMvBxghyfKOayvrG iMVvneC/4Us2eCBFaJEFI70WKn8l2SiHj79sW0eNbbVfSezTvNxAgZzG5ZEzqqrwSu+m rGE64JPTRfZLAvy/lRlFuEJy7fbJ05UukGWqVitgrTS96BIGtzHT9bpYHN8O3HDaEtiX BBnfFSlfu51CnnDZxnF4zo9M6A+vhSOKez9H0YO3YSjFsIRoxdZrPOmPWjH6XfpG7OR9 1AMutQ1EI6UPfBsY3F02yoKY9Y7J5VCU7/Ceh0PQSdGaxCFSYUMKb86Awwua0UabcjkW rSZw== X-Gm-Message-State: AOAM530z8BWedxsPHWPoP1tr2TXmn0GycNr9WZ3X/BwqXjKjRGe65lz9 UaR+35fC7lqA031MyE744Rkj7C1xkS4dFA== X-Google-Smtp-Source: ABdhPJzncmqMLQ5bIXbUR1n0YUdAFOj1AP4OIy8M17kQSDc4nBwKtyBHvsOoYUIQj+Hz4zPRwhIHPA== X-Received: by 2002:a05:600c:1547:b0:39c:7fc6:3082 with SMTP id f7-20020a05600c154700b0039c7fc63082mr23253466wmg.189.1655511672319; Fri, 17 Jun 2022 17:21:12 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id j13-20020a5d452d000000b0021a3d94c7bdsm3837374wra.28.2022.06.17.17.21.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jun 2022 17:21:11 -0700 (PDT) Message-Id: <6419487e26bdaa3fdad357c993f5dd25efe1c70b.1655511660.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Elijah Newren via GitGitGadget" Date: Sat, 18 Jun 2022 00:20:51 +0000 Subject: [PATCH v7 08/17] merge-ort: remove command-line-centric submodule message from merge-ort Fcc: Sent Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MIME-Version: 1.0 To: git@vger.kernel.org Cc: Christian Couder , Taylor Blau , Johannes Altmanninger , Ramsay Jones , Johannes Schindelin , Christian Couder , =?UTF-8?Q?Ren=C3=A9?= Scharfe , =?UTF-8?Q?=C3=86var_Arnfj=C3=B6r=C3=B0?= Bjarmason , Elijah Newren , Johannes Sixt , Josh Steadmon , Emily Shaffer , Elijah Newren , Elijah Newren Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Elijah Newren There was one case in merge-ort that would call path_msg() multiple times for the same logical conflict, and it was in order to give advice about how to resolve a conflict. This advice does not make as much sense with remerge-diff, or with merge-tree being invoked by a GitHub GUI for resolution of messages, and is making it hard to provide which-logical-conflict-affects-which-paths information in a machine parseable way to a higher level caller of merge-tree. Let's simply remove this informational message. Signed-off-by: Elijah Newren --- merge-ort.c | 9 +-------- t/t6437-submodule-merge.sh | 2 +- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/merge-ort.c b/merge-ort.c index 1635d215c0b..7e8b9cd6ea7 100644 --- a/merge-ort.c +++ b/merge-ort.c @@ -1693,15 +1693,8 @@ static int merge_submodule(struct merge_options *opt, (struct commit *)merges.objects[0].item); path_msg(opt, path, 0, _("Failed to merge submodule %s, but a possible merge " - "resolution exists:\n%s\n"), + "resolution exists: %s"), path, sb.buf); - path_msg(opt, path, 1, - _("If this is correct simply add it to the index " - "for example\n" - "by using:\n\n" - " git update-index --cacheinfo 160000 %s \"%s\"\n\n" - "which will accept this suggestion.\n"), - oid_to_hex(&merges.objects[0].item->oid), path); strbuf_release(&sb); break; default: diff --git a/t/t6437-submodule-merge.sh b/t/t6437-submodule-merge.sh index 178413c22f0..c253bf759ab 100755 --- a/t/t6437-submodule-merge.sh +++ b/t/t6437-submodule-merge.sh @@ -133,7 +133,7 @@ test_expect_success 'merging should conflict for non fast-forward' ' (cd merge-search && git checkout -b test-nonforward b && (cd sub && - git rev-parse sub-d > ../expect) && + git rev-parse --short sub-d > ../expect) && if test "$GIT_TEST_MERGE_ALGORITHM" = ort then test_must_fail git merge c >actual -- gitgitgadget