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/remote.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/remote.c')
| -rw-r--r-- | builtin/remote.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/builtin/remote.c b/builtin/remote.c index ad57fc984e..27a611bfad 100644 --- a/builtin/remote.c +++ b/builtin/remote.c @@ -623,6 +623,8 @@ static int mv(int argc, const char **argv) struct string_list remote_branches = STRING_LIST_INIT_NODUP; struct rename_info rename; int i, refspec_updated = 0; + struct each_ref_fn_sha1_adapter wrapped_read_remote_branches = + {read_remote_branches, &rename}; if (argc != 3) usage_with_options(builtin_remote_rename_usage, options); @@ -700,7 +702,7 @@ static int mv(int argc, const char **argv) * First remove symrefs, then rename the rest, finally create * the new symrefs. */ - for_each_ref(read_remote_branches, &rename); + for_each_ref(each_ref_fn_adapter, &wrapped_read_remote_branches); for (i = 0; i < remote_branches.nr; i++) { struct string_list_item *item = remote_branches.items + i; int flag = 0; @@ -781,6 +783,8 @@ static int rm(int argc, const char **argv) struct string_list skipped = STRING_LIST_INIT_DUP; struct branches_for_remote cb_data; int i, result; + struct each_ref_fn_sha1_adapter wrapped_add_branch_for_removal = + {add_branch_for_removal, &cb_data}; memset(&cb_data, 0, sizeof(cb_data)); cb_data.branches = &branches; @@ -821,7 +825,7 @@ static int rm(int argc, const char **argv) * refs, which are invalidated when deleting a branch. */ cb_data.remote = remote; - result = for_each_ref(add_branch_for_removal, &cb_data); + result = for_each_ref(each_ref_fn_adapter, &wrapped_add_branch_for_removal); strbuf_release(&buf); if (!result) @@ -910,7 +914,10 @@ static int get_remote_ref_states(const char *name, if (query & GET_PUSH_REF_STATES) get_push_ref_states(remote_refs, states); } else { - for_each_ref(append_ref_to_tracked_list, states); + struct each_ref_fn_sha1_adapter wrapped_append_ref_to_tracked_list = + {append_ref_to_tracked_list, states}; + + for_each_ref(each_ref_fn_adapter, &wrapped_append_ref_to_tracked_list); string_list_sort(&states->tracked); get_push_ref_states_noquery(states); } |