summaryrefslogtreecommitdiff
path: root/builtin/reflog.c
diff options
context:
space:
mode:
authorMichael Haggerty <mhagger@alum.mit.edu>2015-05-25 18:38:28 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-05-25 19:19:27 (GMT)
commit2b2a5be394bc67bed86bc009195c664dca740bd6 (patch)
tree695bba8905d3f1d806ab329e65d2a297abfc85ac /builtin/reflog.c
parent8353847e85128e0d0bbed862889f6f36c608c73b (diff)
downloadgit-2b2a5be394bc67bed86bc009195c664dca740bd6.zip
git-2b2a5be394bc67bed86bc009195c664dca740bd6.tar.gz
git-2b2a5be394bc67bed86bc009195c664dca740bd6.tar.bz2
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/reflog.c')
-rw-r--r--builtin/reflog.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/builtin/reflog.c b/builtin/reflog.c
index 8182b64..1163dd6 100644
--- a/builtin/reflog.c
+++ b/builtin/reflog.c
@@ -352,7 +352,10 @@ static void reflog_expiry_prepare(const char *refname,
if (cb->unreachable_expire_kind != UE_ALWAYS) {
if (cb->unreachable_expire_kind == UE_HEAD) {
struct commit_list *elem;
- for_each_ref(push_tip_to_list, &cb->tips);
+ struct each_ref_fn_sha1_adapter wrapped_push_tip_to_list =
+ {push_tip_to_list, &cb->tips};
+
+ for_each_ref(each_ref_fn_adapter, &wrapped_push_tip_to_list);
for (elem = cb->tips; elem; elem = elem->next)
commit_list_insert(elem->item, &cb->mark_list);
} else {
@@ -588,9 +591,11 @@ static int cmd_reflog_expire(int argc, const char **argv, const char *prefix)
if (do_all) {
struct collect_reflog_cb collected;
int i;
+ struct each_ref_fn_sha1_adapter wrapped_collect_reflog =
+ {collect_reflog, &collected};
memset(&collected, 0, sizeof(collected));
- for_each_reflog(collect_reflog, &collected);
+ for_each_reflog(each_ref_fn_adapter, &wrapped_collect_reflog);
for (i = 0; i < collected.nr; i++) {
struct collected_reflog *e = collected.e[i];
set_reflog_expiry_param(&cb.cmd, explicit_expiry, e->reflog);