From: brian m. carlson Date: Mon, 25 May 2015 18:38:54 GMT Subject: [PATCH v3 28/56] append_similar_ref(): rewrite to take an object_id argument Message-ID: <1432579162-411464-29-git-send-email-sandals@crustytoothpaste.net> In-Reply-To: <1432579162-411464-1-git-send-email-sandals@crustytoothpaste.net> From: Michael Haggerty Signed-off-by: Michael Haggerty Signed-off-by: brian m. carlson --- help.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/help.c b/help.c index f813093..6f3415b 100644 --- a/help.c +++ b/help.c @@ -407,7 +407,7 @@ struct similar_ref_cb { struct string_list *similar_refs; }; -static int append_similar_ref(const char *refname, const unsigned char *sha1, +static int append_similar_ref(const char *refname, const struct object_id *oid, int flags, void *cb_data) { struct similar_ref_cb *cb = (struct similar_ref_cb *)(cb_data); @@ -425,12 +425,10 @@ static struct string_list guess_refs(const char *ref) { struct similar_ref_cb ref_cb; struct string_list similar_refs = STRING_LIST_INIT_NODUP; - struct each_ref_fn_sha1_adapter wrapped_append_similar_ref = - {append_similar_ref, &ref_cb}; ref_cb.base_ref = ref; ref_cb.similar_refs = &similar_refs; - for_each_ref(each_ref_fn_adapter, &wrapped_append_similar_ref); + for_each_ref(append_similar_ref, &ref_cb); return similar_refs; } -- 2.4.0