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/for-each-ref.c | |
parent | refs: convert struct ref_entry to use struct object_id (diff) | |
download | tgif-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 'builtin/for-each-ref.c')
-rw-r--r-- | builtin/for-each-ref.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c index 83f9cf9163..caccd93ec5 100644 --- a/builtin/for-each-ref.c +++ b/builtin/for-each-ref.c @@ -1072,6 +1072,8 @@ int cmd_for_each_ref(int argc, const char **argv, const char *prefix) int maxcount = 0, quote_style = 0; struct refinfo **refs; struct grab_ref_cbdata cbdata; + struct each_ref_fn_sha1_adapter wrapped_grab_single_ref = + {grab_single_ref, &cbdata}; struct option opts[] = { OPT_BIT('s', "shell", "e_style, @@ -1111,7 +1113,7 @@ int cmd_for_each_ref(int argc, const char **argv, const char *prefix) memset(&cbdata, 0, sizeof(cbdata)); cbdata.grab_pattern = argv; - for_each_rawref(grab_single_ref, &cbdata); + for_each_rawref(each_ref_fn_adapter, &wrapped_grab_single_ref); refs = cbdata.grab_array; num_refs = cbdata.grab_cnt; |