diff options
| author | Michael Haggerty <mhagger@alum.mit.edu> | 2015-05-25 21:38:28 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-05-25 22:19:27 +0300 |
| commit | 2b2a5be394bc67bed86bc009195c664dca740bd6 (patch) | |
| tree | 695bba8905d3f1d806ab329e65d2a297abfc85ac /reachable.c | |
| parent | 8353847e85128e0d0bbed862889f6f36c608c73b (diff) | |
each_ref_fn: change to take an object_id parameter
Change typedef each_ref_fn to take a "const struct object_id *oid"
parameter instead of "const unsigned char *sha1".
To aid this transition, implement an adapter that can be used to wrap
old-style functions matching the old typedef, which is now called
"each_ref_sha1_fn"), and make such functions callable via the new
interface. This requires the old function and its cb_data to be
wrapped in a "struct each_ref_fn_sha1_adapter", and that object to be
used as the cb_data for an adapter function, each_ref_fn_adapter().
This is an enormous diff, but most of it consists of simple,
mechanical changes to the sites that call any of the "for_each_ref"
family of functions. Subsequent to this change, the call sites can be
rewritten one by one to use the new interface.
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>
Diffstat (limited to 'reachable.c')
| -rw-r--r-- | reachable.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/reachable.c b/reachable.c index 69fa6851da..acac86ad3f 100644 --- a/reachable.c +++ b/reachable.c @@ -155,6 +155,8 @@ void mark_reachable_objects(struct rev_info *revs, int mark_reflog, struct progress *progress) { struct connectivity_progress cp; + struct each_ref_fn_sha1_adapter wrapped_add_one_ref = + {add_one_ref, revs}; /* * Set up revision parsing, and mark us as being interested @@ -168,10 +170,10 @@ void mark_reachable_objects(struct rev_info *revs, int mark_reflog, add_index_objects_to_pending(revs, 0); /* Add all external refs */ - for_each_ref(add_one_ref, revs); + for_each_ref(each_ref_fn_adapter, &wrapped_add_one_ref); /* detached HEAD is not included in the list above */ - head_ref(add_one_ref, revs); + head_ref(each_ref_fn_adapter, &wrapped_add_one_ref); /* Add all reflog info */ if (mark_reflog) |