append_similar_ref(): rewrite to take an object_id argument

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Michael Haggerty committed May 25, 2015 at 18:38 UTC 91d6e94ea6238f6678718c53b8aaef733c7b5a05
1 file changed +2 -4
help.c
+2 -4
@@ -407,7 +407,7 @@ struct similar_ref_cb {
407 struct string_list *similar_refs;
408 };
409
410 -static int append_similar_ref(const char *refname, const unsigned char *sha1,
410 +static int append_similar_ref(const char *refname, const struct object_id *oid,
411 int flags, void *cb_data)
412 {
413 struct similar_ref_cb *cb = (struct similar_ref_cb *)(cb_data);
@@ -425,12 +425,10 @@ static struct string_list guess_refs(const char *ref)
425 {
426 struct similar_ref_cb ref_cb;
427 struct string_list similar_refs = STRING_LIST_INIT_NODUP;
428 - struct each_ref_fn_sha1_adapter wrapped_append_similar_ref =
429 - {append_similar_ref, &ref_cb};
428
429 ref_cb.base_ref = ref;
430 ref_cb.similar_refs = &similar_refs;
433 - for_each_ref(each_ref_fn_adapter, &wrapped_append_similar_ref);
431 + for_each_ref(append_similar_ref, &ref_cb);
432 return similar_refs;
433 }
434