mirror of
https://github.com/git/git
synced 2024-08-28 12:09:19 +00:00
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>
This commit is contained in:
parent
a55ce97185
commit
fcb615f51f
|
@ -702,10 +702,10 @@ static void update_refs_for_switch(const struct checkout_opts *opts,
|
|||
}
|
||||
|
||||
static int add_pending_uninteresting_ref(const char *refname,
|
||||
const unsigned char *sha1,
|
||||
const struct object_id *oid,
|
||||
int flags, void *cb_data)
|
||||
{
|
||||
add_pending_sha1(cb_data, refname, sha1, UNINTERESTING);
|
||||
add_pending_sha1(cb_data, refname, oid->hash, UNINTERESTING);
|
||||
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 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);
|
||||
|
@ -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));
|
||||
|
||||
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;
|
||||
|
|
Loading…
Reference in a new issue