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=-11.4 required=3.0 tests=AWL,BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL 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 ABBD21F54E for ; Tue, 2 Aug 2022 21:56:25 +0000 (UTC) Authentication-Results: dcvr.yhbt.net; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="YNM4jX5E"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233297AbiHBV4I (ORCPT ); Tue, 2 Aug 2022 17:56:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34594 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235325AbiHBV4E (ORCPT ); Tue, 2 Aug 2022 17:56:04 -0400 Received: from mail-oa1-x34.google.com (mail-oa1-x34.google.com [IPv6:2001:4860:4864:20::34]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 71871EE36 for ; Tue, 2 Aug 2022 14:56:03 -0700 (PDT) Received: by mail-oa1-x34.google.com with SMTP id 586e51a60fabf-10edfa2d57dso8043179fac.0 for ; Tue, 02 Aug 2022 14:56:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc; bh=Ejoc82BSgUsEOGci34tRpOSxiqnv/s31t7kN6yoG1tY=; b=YNM4jX5EL8wFyjzrcysogYcWFK5XnfmhgbRPfJr6vdwi+GnX1lxzBd2SvnzKboAPUW wcLCvGonxnUYc6c0p8SvPGrpbGICMhEVOcFIUGjv+533mas65+ZRebCy9bH4hudBFQF1 yCFiwPc1e7WhVf8wbTPmHTzY0VoXAS9Gdi3KKe/YucvievJnbW5qLm+8a12eP3j8bFEO 8g2/FfdnIGOgvkM+ReugDdEARUjP7Ls7gp1upmdsuHzK83gMT8uPy+iGCJ8VExqNBZMJ Rl3VmSTH7FBz8n2yZ57Fy+eanc6Jxm8bOMssDrlZsubs3DI8BwtBmAX2yMs6/FhlxDv+ DGmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc; bh=Ejoc82BSgUsEOGci34tRpOSxiqnv/s31t7kN6yoG1tY=; b=Xjcl03Y12zVdme06PtYeyGCIMMZHENhQ5EnT/9pT5ALWw8q2GyU6827Pl76RKliBRK 13o6Gai8HOyAYJ7gU4MmsXlVL5CGe+lyRpcnEeQmJG3oU94rYA7Eb9a0BI2NIXHbGjuO gY0Tq39EyAREJJK2N86wH2qRLpRpBVxAw/mziNEEDn8elaaNmgi/1oY9vAj3KNmciNe8 us1ave/4slXooRW84kd0zDK2tHmon6nAzga9j08k/mNtlpjE89vZ47yqqYT04989yacf d4NlU4w36BpBfYi0KNz42wnpc/m0gK/hpFeI3UCPKZY+PtNxycB3sj5ths/42z4x/p4k LbrA== X-Gm-Message-State: ACgBeo2olFSU4C3LRXv1UPeQq9FPip4cuIY0ZL9q1qmpDXDgDPU6J1Y/ 6kyv65zPeMtqGt0HafLiKTexFmDAL4E+MaR3DiD4xA== X-Google-Smtp-Source: AA6agR51fIcXaw7k4Rh1TyJ+5y6mx4bflGtp3ZXrOiSb101L/1nnmIVarHKhEO73RY4l3OefVe6I38pQnMpg2337IXY= X-Received: by 2002:a05:6870:2191:b0:10e:75b6:fc3a with SMTP id l17-20020a056870219100b0010e75b6fc3amr627393oae.236.1659477362776; Tue, 02 Aug 2022 14:56:02 -0700 (PDT) MIME-Version: 1.0 References: <20220726210020.3397249-1-calvinwan@google.com> <20220728211221.2913928-1-calvinwan@google.com> In-Reply-To: From: Calvin Wan Date: Tue, 2 Aug 2022 14:55:51 -0700 Message-ID: Subject: Re: [PATCH v7] submodule merge: update conflict error message To: Junio C Hamano Cc: git@vger.kernel.org, newren@gmail.com, Johannes.Schindelin@gmx.de, avarab@gmail.com Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org I'm starting to think this is getting out of scope for my patch. For the errors, "not checked out" and "commits not present", I will have a NEEDSWORK bit attached to them in print_submodule_conflict(), and if any of the submodules has those errors, then my message won't print out. That way, we are guaranteed to have 'a' checked out when my message prints, rendering it redundant.