Need that for further reusing of formatting logic in cat-file.
Have plans to get rid of using expand_data in cat-file at all,
and use it only in ref-filter for collecting, formatting and printing
needed data.

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 | 36 ------------------------------------
 ref-filter.h       | 36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index 65c300184cab8..490d9f8a8a922 100644
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@ -176,42 +176,6 @@ static int cat_one_file(int opt, const char *exp_type, 
const char *obj_name,
        return 0;
 }
 
-struct expand_data {
-       struct object_id oid;
-       enum object_type type;
-       unsigned long size;
-       off_t disk_size;
-       const char *rest;
-       struct object_id delta_base_oid;
-
-       /*
-        * If mark_query is true, we do not expand anything, but rather
-        * just mark the object_info with items we wish to query.
-        */
-       int mark_query;
-
-       /*
-        * Whether to split the input on whitespace before feeding it to
-        * get_sha1; this is decided during the mark_query phase based on
-        * whether we have a %(rest) token in our format.
-        */
-       int split_on_whitespace;
-
-       /*
-        * After a mark_query run, this object_info is set up to be
-        * passed to sha1_object_info_extended. It will point to the data
-        * elements above, so you can retrieve the response from there.
-        */
-       struct object_info info;
-
-       /*
-        * This flag will be true if the requested batch format and options
-        * don't require us to call sha1_object_info, which can then be
-        * optimized out.
-        */
-       unsigned skip_object_info : 1;
-};
-
 static int is_atom(const char *atom, const char *s, int slen)
 {
        int alen = strlen(atom);
diff --git a/ref-filter.h b/ref-filter.h
index ff416b733b4b1..56093a85d52b8 100644
--- a/ref-filter.h
+++ b/ref-filter.h
@@ -72,6 +72,42 @@ struct ref_filter {
                verbose;
 };
 
+struct expand_data {
+       struct object_id oid;
+       enum object_type type;
+       unsigned long size;
+       off_t disk_size;
+       const char *rest;
+       struct object_id delta_base_oid;
+
+       /*
+        * If mark_query is true, we do not expand anything, but rather
+        * just mark the object_info with items we wish to query.
+        */
+       int mark_query;
+
+       /*
+        * Whether to split the input on whitespace before feeding it to
+        * get_sha1; this is decided during the mark_query phase based on
+        * whether we have a %(rest) token in our format.
+        */
+       int split_on_whitespace;
+
+       /*
+        * After a mark_query run, this object_info is set up to be
+        * passed to sha1_object_info_extended. It will point to the data
+        * elements above, so you can retrieve the response from there.
+        */
+       struct object_info info;
+
+       /*
+        * This flag will be true if the requested batch format and options
+        * don't require us to call sha1_object_info, which can then be
+        * optimized out.
+        */
+       unsigned skip_object_info : 1;
+};
+
 struct ref_format {
        /*
         * Set these to define the format; make sure you call

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

Reply via email to