No further need in mark_query parameter.
All logic related to expand_atom_into_fields is not needed here also,
we are doing that in ref-filter.
Signed-off-by: Olga Telezhnaia <olyatelezhnaya@xxxxxxxxx>
Mentored-by: Christian Couder <christian.couder@xxxxxxxxx>
Mentored by: Jeff King <peff@xxxxxxxx>
---
builtin/cat-file.c | 25 +------------------------
ref-filter.h | 6 ------
2 files changed, 1 insertion(+), 30 deletions(-)
diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index 0a3f4a47bf1ae..9055fa3a8b0ae 100644
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@ -182,25 +182,6 @@ static int is_atom(const char *atom, const char *s, int slen)
return alen == slen && !memcmp(atom, s, alen);
}
-static void expand_atom_into_fields(struct strbuf *sb, const char *atom, int len,
- struct expand_data *data)
-{
- if (is_atom("objectname", atom, len))
- ; /* do nothing */
- else if (is_atom("objecttype", atom, len))
- data->info.typep = &data->type;
- else if (is_atom("objectsize", atom, len))
- data->info.sizep = &data->size;
- else if (is_atom("objectsize:disk", atom, len))
- data->info.disk_sizep = &data->disk_size;
- else if (is_atom("rest", atom, len))
- data->split_on_whitespace = 1;
- else if (is_atom("deltabase", atom, len))
- data->info.delta_base_sha1 = data->delta_base_oid.hash;
- else
- die("unknown format element: %.*s", len, atom);
-}
-
static void expand_atom(struct strbuf *sb, const char *atom, int len,
struct expand_data *data)
{
@@ -232,11 +213,7 @@ static size_t expand_format(struct strbuf *sb, const char *start, void *vdata)
if (!end)
die("format element '%s' does not end in ')'", start);
- if (data->mark_query)
- expand_atom_into_fields(sb, start + 1, end - start - 1, data);
- else
- expand_atom(sb, start + 1, end - start - 1, data);
-
+ expand_atom(sb, start + 1, end - start - 1, data);
return end - start + 1;
}
diff --git a/ref-filter.h b/ref-filter.h
index 97169548939cd..590a60ffe034d 100644
--- a/ref-filter.h
+++ b/ref-filter.h
@@ -80,12 +80,6 @@ struct expand_data {
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
--
https://github.com/git/git/pull/450
