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 AECEC1FADF for ; Wed, 10 Jan 2018 09:37:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756150AbeAJJg7 (ORCPT ); Wed, 10 Jan 2018 04:36:59 -0500 Received: from a7-12.smtp-out.eu-west-1.amazonses.com ([54.240.7.12]:44092 "EHLO a7-12.smtp-out.eu-west-1.amazonses.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755977AbeAJJgm (ORCPT ); Wed, 10 Jan 2018 04:36:42 -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=pkMreuIktdvxn9f2u+KyFkv0V1qlupHSH1gk1/4ugNU=; b=Y+I+HQCdcL8el9d0qxG414SMMF3fsaY7LvUe4aYaRJOB9ds3fRCADqohm55Hv0Eo t3bps3mAvHs0PTFvfsG3WaA6IqeEsHgQ6KNh6rGMKsFrnA/U/4N986mVQ9RFeneJd58 nMbucberJ8vDsVmmbn8hAyBJTIZzCd0gkwLkyOvY= From: Olga Telezhnaya To: git@vger.kernel.org Message-ID: <01020160df6dc5ba-269b8786-0038-41be-95b2-dee29fcde83f-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 16/18] ref_format: add split_on_whitespace flag 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 Add flag to ref_format struct so that we could pass needed info to cat-file. Signed-off-by: Olga Telezhnaia Mentored-by: Christian Couder Mentored by: Jeff King --- builtin/cat-file.c | 1 + ref-filter.c | 4 ++-- ref-filter.h | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/builtin/cat-file.c b/builtin/cat-file.c index 289912ab1f858..5aac10b9808ff 100644 --- a/builtin/cat-file.c +++ b/builtin/cat-file.c @@ -394,6 +394,7 @@ static int batch_objects(struct batch_options *opt) memset(&data, 0, sizeof(data)); opt->format->cat_file_data = &data; opt->format->is_cat = 1; + opt->format->split_on_whitespace = &data.split_on_whitespace; verify_ref_format(opt->format); if (opt->cmdmode) data.split_on_whitespace = 1; diff --git a/ref-filter.c b/ref-filter.c index 2c955e90bb4c9..0fb33198fb450 100644 --- a/ref-filter.c +++ b/ref-filter.c @@ -494,8 +494,8 @@ static int parse_ref_filter_atom(const struct ref_format *format, need_tagged = 1; if (!strcmp(valid_atom[i].name, "symref")) need_symref = 1; - if (is_cat && !strcmp(valid_atoms[i].name, "rest")) - cat_file_info->split_on_whitespace = 1; + if (!strcmp(valid_atom[i].name, "rest")) + *format->split_on_whitespace = 1; return at; } diff --git a/ref-filter.h b/ref-filter.h index 12a938b0aa6a3..aaf1790e43e62 100644 --- a/ref-filter.h +++ b/ref-filter.h @@ -127,6 +127,7 @@ struct ref_format { */ struct expand_data *cat_file_data; int is_cat; + int *split_on_whitespace; }; #define REF_FORMAT_INIT { NULL, 0, -1 } -- https://github.com/git/git/pull/450