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

add_one_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:39:00 +00:00 committed by Junio C Hamano
parent fd95035fdb
commit 635170f2bb
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
reachable.c
View File

@ -22,9 +22,10 @@ static void update_progress(struct connectivity_progress *cp)
display_progress(cp->progress, cp->count); display_progress(cp->progress, cp->count);
} }
static int add_one_ref(const char *path, const unsigned char *sha1, int flag, void *cb_data) static int add_one_ref(const char *path, const struct object_id *oid,
int flag, void *cb_data)
{ {
struct object *object = parse_object_or_die(sha1, path); struct object *object = parse_object_or_die(oid->hash, path);
struct rev_info *revs = (struct rev_info *)cb_data; struct rev_info *revs = (struct rev_info *)cb_data;
add_pending_object(revs, object, ""); add_pending_object(revs, object, "");
@ -155,8 +156,6 @@ void mark_reachable_objects(struct rev_info *revs, int mark_reflog,
struct progress *progress) struct progress *progress)
{ {
struct connectivity_progress cp; struct connectivity_progress cp;
struct each_ref_fn_sha1_adapter wrapped_add_one_ref =
{add_one_ref, revs};
/* /*
* Set up revision parsing, and mark us as being interested * Set up revision parsing, and mark us as being interested
@ -170,10 +169,10 @@ void mark_reachable_objects(struct rev_info *revs, int mark_reflog,
add_index_objects_to_pending(revs, 0); add_index_objects_to_pending(revs, 0);
/* Add all external refs */ /* Add all external refs */
for_each_ref(each_ref_fn_adapter, &wrapped_add_one_ref); for_each_ref(add_one_ref, revs);
/* detached HEAD is not included in the list above */ /* detached HEAD is not included in the list above */
head_ref(each_ref_fn_adapter, &wrapped_add_one_ref); head_ref(add_one_ref, revs);
/* Add all reflog info */ /* Add all reflog info */
if (mark_reflog) if (mark_reflog)