builtin/show-branch: rewrite functions to work with object_id

diff --git a/shallow.c b/shallow.c
index d8bf40ad4bed3bc846bb71945f1c2bfce76a202d..9488edcbc00278525c6d75e38c1b39acffdceae5 100644 (file)
--- a/shallow.c
+++ b/shallow.c
@@ -31,7 +31,7 @@ int register_shallow(const unsigned char *sha1)
                xmalloc(sizeof(struct commit_graft));
        struct commit *commit = lookup_commit(sha1);
 
-       hashcpy(graft->sha1, sha1);
+       hashcpy(graft->oid.hash, sha1);
        graft->nr_parent = -1;
        if (commit && commit->object.parsed)
                commit->parents = NULL;
@@ -159,11 +159,11 @@ struct write_shallow_data {
 static int write_one_shallow(const struct commit_graft *graft, void *cb_data)
 {
        struct write_shallow_data *data = cb_data;
-       const char *hex = sha1_to_hex(graft->sha1);
+       const char *hex = oid_to_hex(&graft->oid);
        if (graft->nr_parent != -1)
                return 0;
        if (data->flags & SEEN_ONLY) {
-               struct commit *c = lookup_commit(graft->sha1);
+               struct commit *c = lookup_commit(graft->oid.hash);
                if (!c || !(c->object.flags & SEEN)) {
                        if (data->flags & VERBOSE)
                                printf("Removing %s from .git/shallow\n",
@@ -282,7 +282,7 @@ static int advertise_shallow_grafts_cb(const struct commit_graft *graft, void *c
 {
        int fd = *(int *)cb;
        if (graft->nr_parent == -1)
-               packet_write(fd, "shallow %s\n", sha1_to_hex(graft->sha1));
+               packet_write(fd, "shallow %s\n", oid_to_hex(&graft->oid));
        return 0;
 }
 
@@ -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;
                }