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: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-4.0 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,RCVD_IN_DNSWL_HI, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id DA33F1F487 for ; Fri, 27 Mar 2020 00:49:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727755AbgC0AtX (ORCPT ); Thu, 26 Mar 2020 20:49:23 -0400 Received: from mail-wr1-f53.google.com ([209.85.221.53]:36668 "EHLO mail-wr1-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727719AbgC0AtP (ORCPT ); Thu, 26 Mar 2020 20:49:15 -0400 Received: by mail-wr1-f53.google.com with SMTP id 31so9474204wrs.3 for ; Thu, 26 Mar 2020 17:49:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=diEoLJ+RCZcUMznOcM44HHVtmUhP2+nSzdW3yYAozHw=; b=duX2OsKjDuzbQixs7ksuCUTlIV+PcKwDBZB8Fm73RvaFWWAKLoMJZMoFMvyLyw26wS 63YiZVUJT1Hj4oy413slDjfKPqeF7+WG4W5pmOjS1SLNrLf5qJDhzBsRHebJ8vcCCQ4R n6vUUBkRH9ITmVhgB0tC8kMkBupn7FX5R+pzQuXg292DPIWAh/+9/Z/zqTQbY4faeqEu 9R2t7myGZk500n9aBk489LJqYlWwGL2QLVwo91UYaOtYsQotLuN5GnF/f/EYh/zqIInU HIK2+p01G2UNEXUjjlLku6ByBgIoIgRcbFJx7umrVnVo2GhV4i+iOxGoixzVJdleAaPu i6MA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=diEoLJ+RCZcUMznOcM44HHVtmUhP2+nSzdW3yYAozHw=; b=BlciutAnNxCwqWTbo0zpMy3hMrY49KaifZMjqQnB7lf9OH9AqaDGujZbmyWLmmSnKN 1BikIptffcaeMM3Hi6BNaxu9YJDS2VJermlyfewWQE7p3rf/wBX1aX1IG/4pa9CJkA7h X5w5Pqb1sHRs97MFEUu+TrFuyvgnOicZs5WjjCIplmRFIFFlorzJakBTgtqpF17xT/Ra ixQzIzHSBo2W1FWBZ7AZSNl9Lp8GC+/pk6nDvYDDpu9TcnFtYPX48uA/y/ykl3AlXBW6 NrXqXkcKVASkAmt0yR9qf0vop5YQ3OGhGQNiS28oHPECVRgVCPH6gvOcyN0n4+SKat4/ S6sw== X-Gm-Message-State: ANhLgQ0nLbpioWdlyH9WDRx2+ovGM0Nzc+JaDbRfeLzvWXcTPxG5Eg+Q 8to/vsiL45O+lsZuIE+nkCd/82T2 X-Google-Smtp-Source: ADFU+vtUZ2ZVgymZna+ZaY17qg9579Ve4gW2Dk4Wcm0GZLqdUa+YM7d0It2+2k8tVGwqLqbxyENfkQ== X-Received: by 2002:a5d:53ce:: with SMTP id a14mr1102609wrw.129.1585270152526; Thu, 26 Mar 2020 17:49:12 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id z203sm5980649wmg.12.2020.03.26.17.49.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Mar 2020 17:49:12 -0700 (PDT) Message-Id: In-Reply-To: References: From: "Elijah Newren via GitGitGadget" Date: Fri, 27 Mar 2020 00:48:55 +0000 Subject: [PATCH v3 12/18] unpack-trees: move ERROR_WOULD_LOSE_SUBMODULE earlier Fcc: Sent Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MIME-Version: 1.0 To: git@vger.kernel.org Cc: Derrick Stolee , Elijah Newren , Elijah Newren Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Elijah Newren A minor change, but we want to convert the sparse messages to warnings and this allows us to group warnings and errors. Reviewed-by: Derrick Stolee Signed-off-by: Elijah Newren --- unpack-trees.c | 12 ++++++------ unpack-trees.h | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/unpack-trees.c b/unpack-trees.c index a5bc0a3a16d..eeac309e30e 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -43,15 +43,14 @@ static const char *unpack_plumbing_errors[NB_UNPACK_TREES_ERROR_TYPES] = { /* ERROR_BIND_OVERLAP */ "Entry '%s' overlaps with '%s'. Cannot bind.", + /* ERROR_WOULD_LOSE_SUBMODULE */ + "Submodule '%s' cannot checkout new HEAD.", + /* ERROR_SPARSE_NOT_UPTODATE_FILE */ "Entry '%s' not uptodate. Cannot update sparse checkout.", /* ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN */ "Working tree file '%s' would be overwritten by sparse checkout update.", - - - /* ERROR_WOULD_LOSE_SUBMODULE */ - "Submodule '%s' cannot checkout new HEAD.", }; #define ERRORMSG(o,type) \ @@ -166,12 +165,13 @@ void setup_unpack_trees_porcelain(struct unpack_trees_options *opts, */ msgs[ERROR_BIND_OVERLAP] = _("Entry '%s' overlaps with '%s'. Cannot bind."); + msgs[ERROR_WOULD_LOSE_SUBMODULE] = + _("Cannot update submodule:\n%s"); + msgs[ERROR_SPARSE_NOT_UPTODATE_FILE] = _("Cannot update sparse checkout: the following entries are not up to date:\n%s"); msgs[ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN] = _("The following working tree files would be overwritten by sparse checkout update:\n%s"); - msgs[ERROR_WOULD_LOSE_SUBMODULE] = - _("Cannot update submodule:\n%s"); opts->show_all_errors = 1; /* rejected paths may not have a static buffer */ diff --git a/unpack-trees.h b/unpack-trees.h index 5cf41ef5b53..3e996a6c0a9 100644 --- a/unpack-trees.h +++ b/unpack-trees.h @@ -22,9 +22,9 @@ enum unpack_trees_error_types { ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN, ERROR_WOULD_LOSE_UNTRACKED_REMOVED, ERROR_BIND_OVERLAP, + ERROR_WOULD_LOSE_SUBMODULE, ERROR_SPARSE_NOT_UPTODATE_FILE, ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN, - ERROR_WOULD_LOSE_SUBMODULE, NB_UNPACK_TREES_ERROR_TYPES }; -- gitgitgadget