Move logic related to getting object info from cat-file to ref-filter. It will help to reuse whole formatting logic from ref-filter further.
Signed-off-by: Olga Telezhnaia <[email protected]> Mentored-by: Christian Couder <[email protected]> Mentored by: Jeff King <[email protected]> --- builtin/cat-file.c | 16 +++------------- ref-filter.c | 20 ++++++++++++++++++++ ref-filter.h | 2 ++ 3 files changed, 25 insertions(+), 13 deletions(-) diff --git a/builtin/cat-file.c b/builtin/cat-file.c index 61b7acc79155d..c2ca645662ae7 100644 --- a/builtin/cat-file.c +++ b/builtin/cat-file.c @@ -285,21 +285,11 @@ static void batch_object_write(const char *obj_name, struct batch_options *opt, struct strbuf buf = STRBUF_INIT; struct ref_array_item item = {0}; - if (!data->skip_object_info && - sha1_object_info_extended(data->oid.hash, &data->info, - OBJECT_INFO_LOOKUP_REPLACE) < 0) { - printf("%s missing\n", - obj_name ? obj_name : oid_to_hex(&data->oid)); - fflush(stdout); - return; - } - item.objectname = data->oid; - item.type = data->type; - item.size = data->size; - item.disk_size = data->disk_size; item.rest = data->rest; - item.delta_base_oid = &data->delta_base_oid; + item.start_of_request = obj_name; + + if (populate_value(&item)) return; strbuf_expand(&buf, opt->format.format, expand_format, &item); strbuf_addch(&buf, '\n'); diff --git a/ref-filter.c b/ref-filter.c index e69dd1ff5091f..12ca236815411 100644 --- a/ref-filter.c +++ b/ref-filter.c @@ -1451,6 +1451,23 @@ static void need_object(struct ref_array_item *ref) { free(buf); } +static int check_and_fill_for_cat(struct ref_array_item *ref) +{ + if (!cat_file_info->skip_object_info && + sha1_object_info_extended(ref->objectname.hash, &cat_file_info->info, + OBJECT_INFO_LOOKUP_REPLACE) < 0) { + const char *e = ref->start_of_request; + printf("%s missing\n", e ? e : oid_to_hex(&ref->objectname)); + fflush(stdout); + return -1; + } + ref->type = cat_file_info->type; + ref->size = cat_file_info->size; + ref->disk_size = cat_file_info->disk_size; + ref->delta_base_oid = &cat_file_info->delta_base_oid; + return 0; +} + /* * Parse the object referred by ref, and grab needed value. */ @@ -1467,6 +1484,9 @@ int populate_value(struct ref_array_item *ref) ref->symref = ""; } + if (cat_file_info && check_and_fill_for_cat(ref)) + return -1; + /* Fill in specials first */ for (i = 0; i < used_atom_cnt; i++) { struct used_atom *atom = &used_atom[i]; diff --git a/ref-filter.h b/ref-filter.h index 6373167aaacd7..e41d2913c0fff 100644 --- a/ref-filter.h +++ b/ref-filter.h @@ -45,6 +45,8 @@ struct ref_array_item { off_t disk_size; const char *rest; struct object_id *delta_base_oid; + /* Need it for better explanation in error log. */ + const char *start_of_request; char refname[FLEX_ARRAY]; }; -- https://github.com/git/git/pull/452
