From: Olga Telezhnaya Date: Wed, 10 Jan 2018 09:36:41 GMT Subject: [PATCH v2 17/18] cat-file: move skip_object_info into ref-filter Message-ID: <01020160df6dc5cf-1aea868b-d09a-497a-904e-c282d89036f1-000000@eu-west-1.amazonses.com> In-Reply-To: <01020160df6dc499-0e6d11ec-1dcd-4a71-997b-ea231f33fae4-000000@eu-west-1.amazonses.com> Move logic related to skip_object_info into ref-filter, so that cat-file does not use that field at all. Signed-off-by: Olga Telezhnaia Mentored-by: Christian Couder Mentored by: Jeff King --- builtin/cat-file.c | 7 +------ ref-filter.c | 5 +++++ ref-filter.h | 1 + 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/builtin/cat-file.c b/builtin/cat-file.c index 5aac10b9808ff..19cee0d22fabe 100644 --- a/builtin/cat-file.c +++ b/builtin/cat-file.c @@ -395,16 +395,11 @@ static int batch_objects(struct batch_options *opt) opt->format->cat_file_data = &data; opt->format->is_cat = 1; opt->format->split_on_whitespace = &data.split_on_whitespace; + opt->format->all_objects = opt->all_objects; verify_ref_format(opt->format); if (opt->cmdmode) data.split_on_whitespace = 1; - if (opt->all_objects) { - struct object_info empty = OBJECT_INFO_INIT; - if (!memcmp(&data.info, &empty, sizeof(empty))) - data.skip_object_info = 1; - } - /* * If we are printing out the object, then always fill in the type, * since we will want to decide whether or not to stream. diff --git a/ref-filter.c b/ref-filter.c index 0fb33198fb450..83bacdd8bdd78 100644 --- a/ref-filter.c +++ b/ref-filter.c @@ -764,6 +764,11 @@ int verify_ref_format(struct ref_format *format) } if (format->need_color_reset_at_eol && !want_color(format->use_color)) format->need_color_reset_at_eol = 0; + if (is_cat && format->all_objects) { + struct object_info empty = OBJECT_INFO_INIT; + if (!memcmp(&cat_file_info->info, &empty, sizeof(empty))) + cat_file_info->skip_object_info = 1; + } return 0; } diff --git a/ref-filter.h b/ref-filter.h index aaf1790e43e62..e588d1f50eef6 100644 --- a/ref-filter.h +++ b/ref-filter.h @@ -128,6 +128,7 @@ struct ref_format { struct expand_data *cat_file_data; int is_cat; int *split_on_whitespace; + int all_objects; }; #define REF_FORMAT_INIT { NULL, 0, -1 } -- https://github.com/git/git/pull/450