summaryrefslogtreecommitdiff
path: root/shallow.c
diff options
context:
space:
mode:
Diffstat (limited to 'shallow.c')
-rw-r--r--shallow.c19
1 files changed, 13 insertions, 6 deletions
diff --git a/shallow.c b/shallow.c
index d08d264..9488edc 100644
--- a/shallow.c
+++ b/shallow.c
@@ -512,6 +512,8 @@ void assign_shallow_commits_to_refs(struct shallow_info *info,
unsigned int i, nr;
int *shallow, nr_shallow = 0;
struct paint_info pi;
+ struct each_ref_fn_sha1_adapter wrapped_mark_uninteresting =
+ {mark_uninteresting, NULL};
trace_printf_key(&trace_shallow, "shallow: assign_shallow_commits_to_refs\n");
shallow = xmalloc(sizeof(*shallow) * (info->nr_ours + info->nr_theirs));
@@ -542,8 +544,8 @@ void assign_shallow_commits_to_refs(struct shallow_info *info,
* connect to old refs. If not (e.g. force ref updates) it'll
* have to go down to the current shallow commits.
*/
- head_ref(mark_uninteresting, NULL);
- for_each_ref(mark_uninteresting, NULL);
+ head_ref(each_ref_fn_adapter, &wrapped_mark_uninteresting);
+ for_each_ref(each_ref_fn_adapter, &wrapped_mark_uninteresting);
/* Mark potential bottoms so we won't go out of bound */
for (i = 0; i < nr_shallow; i++) {
@@ -618,6 +620,8 @@ static void post_assign_shallow(struct shallow_info *info,
int dst, i, j;
int bitmap_nr = (info->ref->nr + 31) / 32;
struct commit_array ca;
+ struct each_ref_fn_sha1_adapter wrapped_add_ref =
+ {add_ref, &ca};
trace_printf_key(&trace_shallow, "shallow: post_assign_shallow\n");
if (ref_status)
@@ -641,8 +645,8 @@ static void post_assign_shallow(struct shallow_info *info,
info->nr_theirs = dst;
memset(&ca, 0, sizeof(ca));
- head_ref(add_ref, &ca);
- for_each_ref(add_ref, &ca);
+ head_ref(each_ref_fn_adapter, &wrapped_add_ref);
+ for_each_ref(each_ref_fn_adapter, &wrapped_add_ref);
/* Remove unreachable shallow commits from "ours" */
for (i = dst = 0; i < info->nr_ours; i++) {
@@ -674,9 +678,12 @@ int delayed_reachability_test(struct shallow_info *si, int c)
if (!si->commits) {
struct commit_array ca;
+ struct each_ref_fn_sha1_adapter wrapped_add_ref =
+ {add_ref, &ca};
+
memset(&ca, 0, sizeof(ca));
- head_ref(add_ref, &ca);
- for_each_ref(add_ref, &ca);
+ head_ref(each_ref_fn_adapter, &wrapped_add_ref);
+ for_each_ref(each_ref_fn_adapter, &wrapped_add_ref);
si->commits = ca.commits;
si->nr_commits = ca.nr;
}