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/pack-objects.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 'builtin/pack-objects.c')
| -rw-r--r-- | builtin/pack-objects.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index c067107a6..81f0e57c5 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -626,6 +626,8 @@ static struct object_entry **compute_write_order(void) struct object_entry **wo = xmalloc(to_pack.nr_objects * sizeof(*wo)); struct object_entry *objects = to_pack.objects; + struct each_ref_fn_sha1_adapter wrapped_mark_tagged = + {mark_tagged, NULL}; for (i = 0; i < to_pack.nr_objects; i++) { objects[i].tagged = 0; @@ -651,7 +653,7 @@ static struct object_entry **compute_write_order(void) /* * Mark objects that are at the tip of tags. */ - for_each_tag_ref(mark_tagged, NULL); + for_each_tag_ref(each_ref_fn_adapter, &wrapped_mark_tagged); /* * Give the objects in the original recency order until @@ -2784,8 +2786,12 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix) argv_array_clear(&rp); } cleanup_preferred_base(); - if (include_tag && nr_result) - for_each_ref(add_ref_tag, NULL); + if (include_tag && nr_result) { + struct each_ref_fn_sha1_adapter wrapped_add_ref_tag = + {add_ref_tag, NULL}; + + for_each_ref(each_ref_fn_adapter, &wrapped_add_ref_tag); + } stop_progress(&progress_state); if (non_empty && !nr_result) |