add_pending_uninteresting_ref(): rewrite to take an object_id argument

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>

diff --git a/builtin/checkout.c b/builtin/checkout.c
index 9416aa2450fbbc904a679cb6bdf2fe36f4a89aa4..9b49f0e413ba03ebfee924d514a175d8f74fe1d3 100644 (file)
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -702,10 +702,10 @@ static void update_refs_for_switch(const struct checkout_opts *opts,
 }
 
 static int add_pending_uninteresting_ref(const char *refname,
 }
 
 static int add_pending_uninteresting_ref(const char *refname,

-                                        const unsigned char *sha1,
+                                        const struct object_id *oid,

                                         int flags, void *cb_data)
 {
                                         int flags, void *cb_data)
 {

-       add_pending_sha1(cb_data, refname, sha1, UNINTERESTING);
+       add_pending_sha1(cb_data, refname, oid->hash, UNINTERESTING);

        return 0;
 }
 
        return 0;
 }
 


@@ -784,8 +784,6 @@ static void orphaned_commit_warning(struct commit *old, struct commit *new)
        struct rev_info revs;
        struct object *object = &old->object;
        struct object_array refs;
        struct rev_info revs;
        struct object *object = &old->object;
        struct object_array refs;

-       struct each_ref_fn_sha1_adapter wrapped_add_pending_uninteresting_ref =
-               {add_pending_uninteresting_ref, &revs};

 
        init_revisions(&revs, NULL);
        setup_revisions(0, NULL, &revs, NULL);
 
        init_revisions(&revs, NULL);
        setup_revisions(0, NULL, &revs, NULL);


@@ -793,7 +791,7 @@ static void orphaned_commit_warning(struct commit *old, struct commit *new)
        object->flags &= ~UNINTERESTING;
        add_pending_object(&revs, object, sha1_to_hex(object->sha1));
 
        object->flags &= ~UNINTERESTING;
        add_pending_object(&revs, object, sha1_to_hex(object->sha1));
 

-       for_each_ref(each_ref_fn_adapter, &wrapped_add_pending_uninteresting_ref);
+       for_each_ref(add_pending_uninteresting_ref, &revs);

        add_pending_sha1(&revs, "HEAD", new->object.sha1, UNINTERESTING);
 
        refs = revs.pending;
        add_pending_sha1(&revs, "HEAD", new->object.sha1, UNINTERESTING);
 
        refs = revs.pending;