From patchwork Sun Nov 11 06:23:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Elijah Newren X-Patchwork-Id: 10677509 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C980F139B for ; Sun, 11 Nov 2018 06:23:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BAD2A2AFA1 for ; Sun, 11 Nov 2018 06:23:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AF3832B2DE; Sun, 11 Nov 2018 06:23:37 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 10FF62B4E8 for ; Sun, 11 Nov 2018 06:23:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727462AbeKKQLB (ORCPT ); Sun, 11 Nov 2018 11:11:01 -0500 Received: from mail-oi1-f196.google.com ([209.85.167.196]:39032 "EHLO mail-oi1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727307AbeKKQLB (ORCPT ); Sun, 11 Nov 2018 11:11:01 -0500 Received: by mail-oi1-f196.google.com with SMTP id 192-v6so4763941oii.6 for ; Sat, 10 Nov 2018 22:23:23 -0800 (PST) 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=9+LUPzmLQAjcx0lP9hKzfHOMaos3NdiJIOHNt17kb2s=; b=ke6YPX/do6LwPRqR1NFOVQ6XZJW08hWPIY7TKDPBzJ4WphBu9eiRJLe/6/wzEEqOZ9 TN8sHnp+gZjn4FxDfeujPUBOliGrYnXB59n/38xKb587xudlLeweK1LtH1YtiVmXodV4 6r/etM/0rhTRIdixHz2vtQpkEv5iIuUta0Tfd9PiVkmtgafHqfatK7ANcGNT6Erw9sXS DINdpFaVcV2K/tE/ErQoGl28usGVTtKzgWol7xZBrF7kxxpvRoPSLiLdrjT1ldQf7cMn APO9jv/G6Lu8RnWJxB2zcH2hp7BI8GI6+MUdNtIkpAXWnFz8tiQtoDHSTQXzaiUzAZPR 3BRg== 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=9+LUPzmLQAjcx0lP9hKzfHOMaos3NdiJIOHNt17kb2s=; b=T8S5Ub1bgmt9TQUfEOWTFpCecdAPNAQh10+VMMRKc6tW9i4G/hym4a3m+HyUwBCz+r s0YzfZ1mIvFYEP5Aa54JP4nLbDZm4JhSIp2pNFmp8QHg+KZSb3vo27DUZt64Gkdoatmp PWYelabFfjA4S7i0qDI3CB6dDjjF7zX4nN/Cy3VtHhooKA4hsf74E3/zLHno6z8PekX1 9qTOZ0sY8AQLegUU/QWWztUzz9IkIVdnD7nxU8JHU/dhhshBBhQbM9hC+cvJKTclcCpQ NTt65tOZlpQrH0culTAY4y3lZAnj+xjgKARn6QzSs8lKZqcqXgPLIBZKuUOVNdBmzwAD Ld1w== X-Gm-Message-State: AGRZ1gJSdKOqVzRfJRNJTab6CqZnKDESZOux6SsuKI4KxcV3iwjJEMDs QiB4SXUppPn0iYK+Zi8MOTKasany X-Google-Smtp-Source: AJdET5fwV0RGet1utUelrWEHLEWhvTd9pWDpEs0MbW9noJUSDIeYba67ZjgGv8UO2dE4V0l4fvor5w== X-Received: by 2002:aca:62c3:: with SMTP id w186-v6mr8959267oib.320.1541917402585; Sat, 10 Nov 2018 22:23:22 -0800 (PST) Received: from tiger.attlocal.net ([2602:30a:2c28:20f0:7c1a:85e3:2ea9:5d7e]) by smtp.gmail.com with ESMTPSA id f34sm1286855otb.25.2018.11.10.22.23.21 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 10 Nov 2018 22:23:22 -0800 (PST) From: Elijah Newren To: git@vger.kernel.org Cc: larsxschneider@gmail.com, sandals@crustytoothpaste.net, peff@peff.net, me@ttaylorr.com, jrnieder@gmail.com, Elijah Newren Subject: [PATCH 03/10] fast-export: use value from correct enum Date: Sat, 10 Nov 2018 22:23:05 -0800 Message-Id: <20181111062312.16342-4-newren@gmail.com> X-Mailer: git-send-email 2.19.1.866.g82735bcbde In-Reply-To: <20181111062312.16342-1-newren@gmail.com> References: <20181111062312.16342-1-newren@gmail.com> MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP ABORT and ERROR happen to have the same value, but come from differnt enums. Use the one from the correct enum. Signed-off-by: Elijah Newren --- builtin/fast-export.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/fast-export.c b/builtin/fast-export.c index 456797c12a..1a299c2a21 100644 --- a/builtin/fast-export.c +++ b/builtin/fast-export.c @@ -752,7 +752,7 @@ static void handle_tag(const char *name, struct tag *tag) tagged_mark = get_object_mark(tagged); if (!tagged_mark) { switch(tag_of_filtered_mode) { - case ABORT: + case ERROR: die("tag %s tags unexported object; use " "--tag-of-filtered-object= to handle it", oid_to_hex(&tag->object.oid));