[PATCH 02/20] cat-file: reuse struct ref_format
- From
Olga Telezhnaya <olyatelezhnaya@gmail.com>
- Date
- Jan 9, 2018, 13:05 UTC
- Message-ID
- <01020160db067a62-874402f0-c7c0-4fb4-91c3-ac644fcf9a1f-000000@eu-west-1.amazonses.com>
- In-Reply-To
- <01020160db0679c9-799a0bc4-b6d1-43e2-ad3b-80be4e4c55e9-000000@eu-west-1.amazonses.com>
Start using ref_format struct instead of simple char*. Need that for further reusing of formatting logic from ref-filter.
Signed-off-by: Olga Telezhnaia <olyatelezhnaya@gmail.com> Mentored-by: Christian Couder <christian.couder@gmail.com> Mentored by: Jeff King <peff@peff.net> --- builtin/cat-file.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/builtin/cat-file.c b/builtin/cat-file.c index f783b39b9bd5c..7655a9a726773 100644 --- a/builtin/cat-file.c +++ b/builtin/cat-file.c @@ -13,15 +13,16 @@ #include "tree-walk.h" #include "sha1-array.h" #include "packfile.h" +#include "ref-filter.h" struct batch_options { + struct ref_format *format; int enabled; int follow_symlinks; int print_contents; int buffer_output; int all_objects; int cmdmode; /* may be 'w' or 'c' for --filters or --textconv */ - const char *format; }; static const char *force_path; @@ -353,7 +354,7 @@ static void batch_object_write(const char *obj_name, struct batch_options *opt, return; } - strbuf_expand(&buf, opt->format, expand_format, data); + strbuf_expand(&buf, opt->format->format, expand_format, data); strbuf_addch(&buf, '\n'); batch_write(opt, buf.buf, buf.len); strbuf_release(&buf); @@ -446,8 +447,8 @@ static int batch_objects(struct batch_options *opt) int save_warning; int retval = 0; - if (!opt->format) - opt->format = "%(objectname) %(objecttype) %(objectsize)"; + if (!opt->format->format) + opt->format->format = "%(objectname) %(objecttype) %(objectsize)"; /* * Expand once with our special mark_query flag, which will prime the @@ -456,7 +457,7 @@ static int batch_objects(struct batch_options *opt) */ memset(&data, 0, sizeof(data)); data.mark_query = 1; - strbuf_expand(&buf, opt->format, expand_format, &data); + strbuf_expand(&buf, opt->format->format, expand_format, &data); data.mark_query = 0; if (opt->cmdmode) data.split_on_whitespace = 1; @@ -548,7 +549,7 @@ static int batch_option_callback(const struct option *opt, bo->enabled = 1; bo->print_contents = !strcmp(opt->long_name, "batch"); - bo->format = arg; + bo->format->format = arg; return 0; } @@ -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; const struct option options[] = { -- https://github.com/git/git/pull/450