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 /builtin/fsck.c | |
| parent | 8353847e85128e0d0bbed862889f6f36c608c73b (diff) | |
| download | git-2b2a5be394bc67bed86bc009195c664dca740bd6.tar.gz | |
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 'builtin/fsck.c')
| -rw-r--r-- | builtin/fsck.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/builtin/fsck.c b/builtin/fsck.c index 4783896fd6..48d0c2e6f0 100644 --- a/builtin/fsck.c +++ b/builtin/fsck.c @@ -504,11 +504,16 @@ static int fsck_handle_ref(const char *refname, const unsigned char *sha1, int f static void get_default_heads(void) { + struct each_ref_fn_sha1_adapter wrapped_fsck_handle_ref = + {fsck_handle_ref, NULL}; + struct each_ref_fn_sha1_adapter wrapped_fsck_handle_reflog = + {fsck_handle_reflog, NULL}; + if (head_points_at && !is_null_sha1(head_sha1)) fsck_handle_ref("HEAD", head_sha1, 0, NULL); - for_each_rawref(fsck_handle_ref, NULL); + for_each_rawref(each_ref_fn_adapter, &wrapped_fsck_handle_ref); if (include_reflogs) - for_each_reflog(fsck_handle_reflog, NULL); + for_each_reflog(each_ref_fn_adapter, &wrapped_fsck_handle_reflog); /* * Not having any default heads isn't really fatal, but |