undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add_pending_uninteresting_ref(): rewrite to take an object_id argument

Browse Source 
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:
Michael Haggerty 2015-05-25 18:38:33 +00:00 committed by Junio C Hamano
parent a55ce97185
commit fcb615f51f
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
builtin/checkout.c
View File

@ -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 rev_info revs;
struct object *object = &old->object; struct object *object = &old->object;
struct object_array refs; struct object_array refs;
struct each_ref_fn_sha1_adapter wrapped_add_pending_uninteresting_ref =
{add_pending_uninteresting_ref, &revs};
init_revisions(&revs, NULL); init_revisions(&revs, NULL);
setup_revisions(0, NULL, &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; object->flags &= ~UNINTERESTING;
add_pending_object(&revs, object, sha1_to_hex(object->sha1)); 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); add_pending_sha1(&revs, "HEAD", new->object.sha1, UNINTERESTING);
refs = revs.pending; refs = revs.pending;