From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-2.7 required=3.0 tests=AWL,BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD shortcircuit=no autolearn=no autolearn_force=no version=3.4.0 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 2A7531FADF for ; Wed, 10 Jan 2018 09:37:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965282AbeAJJho (ORCPT ); Wed, 10 Jan 2018 04:37:44 -0500 Received: from a7-12.smtp-out.eu-west-1.amazonses.com ([54.240.7.12]:44104 "EHLO a7-12.smtp-out.eu-west-1.amazonses.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756061AbeAJJgn (ORCPT ); Wed, 10 Jan 2018 04:36:43 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=shh3fegwg5fppqsuzphvschd53n6ihuv; d=amazonses.com; t=1515577001; h=From:To:Message-ID:In-Reply-To:References:Subject:MIME-Version:Content-Type:Content-Transfer-Encoding:Date:Feedback-ID; bh=XTKDFh00CyV8FOpgtoPwuSU+mGnUTJMhqKt629tMyQg=; b=Z+9g2z0VD9hnsNggMXE88kOV3g0Isu+RwP8bSy6QRz0neh9qt7SzbsA+ki3B2Sib wWd0Veiebyw6/mKKDZ7vemQ7Vn7vBu9rHfwvhrIMsDBOLZfAHHeSL/F5O2FdcBhFo6S KlaEzH5ysNgqvDsLOFSCDbVYT7y7ic5Am1mcMqE8= From: Olga Telezhnaya To: git@vger.kernel.org Message-ID: <01020160df6dc54b-3776504b-c5b2-4139-8ade-e54b3213df19-000000@eu-west-1.amazonses.com> In-Reply-To: <01020160df6dc499-0e6d11ec-1dcd-4a71-997b-ea231f33fae4-000000@eu-west-1.amazonses.com> References: <01020160df6dc499-0e6d11ec-1dcd-4a71-997b-ea231f33fae4-000000@eu-west-1.amazonses.com> Subject: [PATCH v2 07/18] cat-file: remove unused code MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Date: Wed, 10 Jan 2018 09:36:41 +0000 X-SES-Outgoing: 2018.01.10-54.240.7.12 Feedback-ID: 1.eu-west-1.YYPRFFOog89kHDDPKvTu4MK67j4wW0z7cAgZtFqQH58=:AmazonSES Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org No further need in mark_query parameter. All logic related to expand_atom_into_fields is not needed here also, we are doing that in ref-filter. Signed-off-by: Olga Telezhnaia Mentored-by: Christian Couder Mentored by: Jeff King --- builtin/cat-file.c | 25 +------------------------ ref-filter.h | 6 ------ 2 files changed, 1 insertion(+), 30 deletions(-) diff --git a/builtin/cat-file.c b/builtin/cat-file.c index 0a3f4a47bf1ae..9055fa3a8b0ae 100644 --- a/builtin/cat-file.c +++ b/builtin/cat-file.c @@ -182,25 +182,6 @@ static int is_atom(const char *atom, const char *s, int slen) return alen == slen && !memcmp(atom, s, alen); } -static void expand_atom_into_fields(struct strbuf *sb, const char *atom, int len, - struct expand_data *data) -{ - if (is_atom("objectname", atom, len)) - ; /* do nothing */ - else if (is_atom("objecttype", atom, len)) - data->info.typep = &data->type; - else if (is_atom("objectsize", atom, len)) - data->info.sizep = &data->size; - else if (is_atom("objectsize:disk", atom, len)) - data->info.disk_sizep = &data->disk_size; - else if (is_atom("rest", atom, len)) - data->split_on_whitespace = 1; - else if (is_atom("deltabase", atom, len)) - data->info.delta_base_sha1 = data->delta_base_oid.hash; - else - die("unknown format element: %.*s", len, atom); -} - static void expand_atom(struct strbuf *sb, const char *atom, int len, struct expand_data *data) { @@ -232,11 +213,7 @@ static size_t expand_format(struct strbuf *sb, const char *start, void *vdata) if (!end) die("format element '%s' does not end in ')'", start); - if (data->mark_query) - expand_atom_into_fields(sb, start + 1, end - start - 1, data); - else - expand_atom(sb, start + 1, end - start - 1, data); - + expand_atom(sb, start + 1, end - start - 1, data); return end - start + 1; } diff --git a/ref-filter.h b/ref-filter.h index 97169548939cd..590a60ffe034d 100644 --- a/ref-filter.h +++ b/ref-filter.h @@ -80,12 +80,6 @@ struct expand_data { const char *rest; struct object_id delta_base_oid; - /* - * If mark_query is true, we do not expand anything, but rather - * just mark the object_info with items we wish to query. - */ - int mark_query; - /* * Whether to split the input on whitespace before feeding it to * get_sha1; this is decided during the mark_query phase based on -- https://github.com/git/git/pull/450