[PATCH RFC v2 03/25] cat-file: reuse struct ref_format

[Olga Telezhnaya]

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 <olyatelezhn...@gmail.com>
Mentored-by: Christian Couder <christian.cou...@gmail.com>
Mentored by: Jeff King <p...@peff.net>
---
 builtin/cat-file.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index f5fa4fd75af26..98fc5ec069a49 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;
@@ -348,7 +349,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);
@@ -441,8 +442,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
@@ -451,7 +452,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;
@@ -543,7 +544,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;
 }
@@ -552,7 +553,7 @@ 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 batch_options batch = { REF_FORMAT_INIT };
        int unknown_type = 0;
 
        const struct option options[] = {

--
https://github.com/git/git/pull/452