diff options
| author | Michael Haggerty <mhagger@alum.mit.edu> | 2015-05-25 18:38:28 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-05-25 12:19:27 -0700 |
| commit | 2b2a5be394bc67bed86bc009195c664dca740bd6 (patch) | |
| tree | 695bba8905d3f1d806ab329e65d2a297abfc85ac /replace_object.c | |
| parent | 8353847e85128e0d0bbed862889f6f36c608c73b (diff) | |
| download | git-2b2a5be394bc67bed86bc009195c664dca740bd6.tar.gz git-2b2a5be394bc67bed86bc009195c664dca740bd6.tar.xz | |
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 'replace_object.c')
| -rw-r--r-- | replace_object.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/replace_object.c b/replace_object.c index 0ab2dc137..a8a2da944 100644 --- a/replace_object.c +++ b/replace_object.c @@ -80,11 +80,13 @@ static int register_replace_ref(const char *refname, static void prepare_replace_object(void) { static int replace_object_prepared; + struct each_ref_fn_sha1_adapter wrapped_register_replace_ref = + {register_replace_ref, NULL}; if (replace_object_prepared) return; - for_each_replace_ref(register_replace_ref, NULL); + for_each_replace_ref(each_ref_fn_adapter, &wrapped_register_replace_ref); replace_object_prepared = 1; if (!replace_object_nr) check_replace_refs = 0; |