ref-filter: populate symref from iterator

With a previous commit, the reference the symbolic ref points to is saved
in the ref iterator records. Instead of making a separate call to
resolve_refdup() each time, we can just populate the ref_array_item with
the value from the iterator.

Signed-off-by: John Cai <johncai86@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/ref-filter.c b/ref-filter.c
index 39997890feb1bd8869aa8dc9a70c38ce9f7ae795..4d1f3ff3d23095b531d3d9a9f916a5684c606459 100644 (file)
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -2343,6 +2343,12 @@ static int populate_value(struct ref_array_item *ref, struct strbuf *err)
 
        CALLOC_ARRAY(ref->value, used_atom_cnt);
 
+       /**
+        * NEEDSWORK: The following code might be unncessary if all codepaths
+        * that call populate_value() populates the symref member of ref_array_item
+        * like in apply_ref_filter(). Currently pretty_print_ref() is the only codepath
+        * that calls populate_value() without first populating symref.
+        */
        if (need_symref && (ref->flag & REF_ISSYMREF) && !ref->symref) {
                ref->symref = refs_resolve_refdup(get_main_ref_store(the_repository),
                                                  ref->refname,
@@ -2783,7 +2789,7 @@ static int filter_ref_kind(struct ref_filter *filter, const char *refname)
        return ref_kind_from_refname(refname);
 }
 
-static struct ref_array_item *apply_ref_filter(const char *refname, const struct object_id *oid,
+static struct ref_array_item *apply_ref_filter(const char *refname, const char *referent, const struct object_id *oid,
                            int flag, struct ref_filter *filter)
 {
        struct ref_array_item *ref;
@@ -2852,6 +2858,7 @@ static struct ref_array_item *apply_ref_filter(const char *refname, const struct
        ref->commit = commit;
        ref->flag = flag;
        ref->kind = kind;
+       ref->symref = xstrdup_or_null(referent);
 
        return ref;
 }
@@ -2865,12 +2872,12 @@ struct ref_filter_cbdata {
  * A call-back given to for_each_ref().  Filter refs and keep them for
  * later object processing.
  */
-static int filter_one(const char *refname, const char *referent UNUSED, const struct object_id *oid, int flag, void *cb_data)
+static int filter_one(const char *refname, const char *referent, const struct object_id *oid, int flag, void *cb_data)
 {
        struct ref_filter_cbdata *ref_cbdata = cb_data;
        struct ref_array_item *ref;
 
-       ref = apply_ref_filter(refname, oid, flag, ref_cbdata->filter);
+       ref = apply_ref_filter(refname, referent, oid, flag, ref_cbdata->filter);
        if (ref)
                ref_array_append(ref_cbdata->array, ref);
 
@@ -2900,13 +2907,13 @@ struct ref_filter_and_format_cbdata {
        } internal;
 };
 
-static int filter_and_format_one(const char *refname, const char *referent UNUSED, const struct object_id *oid, int flag, void *cb_data)
+static int filter_and_format_one(const char *refname, const char *referent, const struct object_id *oid, int flag, void *cb_data)
 {
        struct ref_filter_and_format_cbdata *ref_cbdata = cb_data;
        struct ref_array_item *ref;
        struct strbuf output = STRBUF_INIT, err = STRBUF_INIT;
 
-       ref = apply_ref_filter(refname, oid, flag, ref_cbdata->filter);
+       ref = apply_ref_filter(refname, referent, oid, flag, ref_cbdata->filter);
        if (!ref)
                return 0;