On Wed, Jan 10, 2018 at 09:36:41AM +0000, Olga Telezhnaya wrote: > Start using ref_format struct instead of simple char*. > Need that for further reusing of formatting logic from ref-filter. OK, this makes sense (though again, at some point we want this to stop being a "ref_format" and just be a "format"). > struct batch_options { > + struct ref_format *format; Does this need to be a pointer? We can just store the ref_format inside the struct, right? And then... > @@ -557,7 +558,8 @@ int cmd_cat_file(int argc, const char **argv, const char *prefix) > { > int opt = 0; > const char *exp_type = NULL, *obj_name = NULL; > - struct batch_options batch = {0}; > + struct ref_format format = REF_FORMAT_INIT; > + struct batch_options batch = {&format}; > int unknown_type = 0; ...here you would not need the extra local variable. You can initialize it like: struct batch_options batch = { REF_FORMAT_INIT }; -Peff