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>
Michael Haggerty committed
May 25, 2015 at 18:38 UTC
fcb615f51f303177a8454e988f8e8ef9fb3e94d9
1 file changed
+3
-5
builtin/checkout.c
+3
-5
@@ -702,10 +702,10 @@ static void update_refs_for_switch(const struct checkout_opts *opts,
702
}
703
704
static int add_pending_uninteresting_ref(const char *refname,
705
- const unsigned char *sha1,
705
+ const struct object_id *oid,
706
int flags, void *cb_data)
707
{
708
- add_pending_sha1(cb_data, refname, sha1, UNINTERESTING);
708
+ add_pending_sha1(cb_data, refname, oid->hash, UNINTERESTING);
709
return 0;
710
}
711
@@ -784,8 +784,6 @@ static void orphaned_commit_warning(struct commit *old, struct commit *new)
784
struct rev_info revs;
785
struct object *object = &old->object;
786
struct object_array refs;
787
- struct each_ref_fn_sha1_adapter wrapped_add_pending_uninteresting_ref =
788
- {add_pending_uninteresting_ref, &revs};
787
788
init_revisions(&revs, NULL);
789
setup_revisions(0, NULL, &revs, NULL);
@@ -793,7 +791,7 @@ static void orphaned_commit_warning(struct commit *old, struct commit *new)
791
object->flags &= ~UNINTERESTING;
792
add_pending_object(&revs, object, sha1_to_hex(object->sha1));
793
796
- for_each_ref(each_ref_fn_adapter, &wrapped_add_pending_uninteresting_ref);
794
+ for_each_ref(add_pending_uninteresting_ref, &revs);
795
add_pending_sha1(&revs, "HEAD", new->object.sha1, UNINTERESTING);
796
797
refs = revs.pending;