summaryrefslogtreecommitdiff
path: root/walker.c
diff options
context:
space:
mode:
authorMichael Haggerty <mhagger@alum.mit.edu>2015-05-25 18:39:14 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-05-25 19:19:37 (GMT)
commitb4ebaf9eea30a38a0462ff72ea3e0aec0101bb7e (patch)
tree7863b7a1fdda0a78d97618c401c236af7f079ad7 /walker.c
parent21758affae79a23e402c46cb375a0fd0407050c9 (diff)
downloadgit-b4ebaf9eea30a38a0462ff72ea3e0aec0101bb7e.zip
git-b4ebaf9eea30a38a0462ff72ea3e0aec0101bb7e.tar.gz
git-b4ebaf9eea30a38a0462ff72ea3e0aec0101bb7e.tar.bz2
mark_complete(): 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>
Diffstat (limited to 'walker.c')
-rw-r--r--walker.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/walker.c b/walker.c
index bb2e0b9..44a936c 100644
--- a/walker.c
+++ b/walker.c
@@ -200,9 +200,11 @@ static int interpret_target(struct walker *walker, char *target, unsigned char *
return -1;
}
-static int mark_complete(const char *path, const unsigned char *sha1, int flag, void *cb_data)
+static int mark_complete(const char *path, const struct object_id *oid,
+ int flag, void *cb_data)
{
- struct commit *commit = lookup_commit_reference_gently(sha1, 1);
+ struct commit *commit = lookup_commit_reference_gently(oid->hash, 1);
+
if (commit) {
commit->object.flags |= COMPLETE;
commit_list_insert(commit, &complete);
@@ -269,10 +271,7 @@ int walker_fetch(struct walker *walker, int targets, char **target,
}
if (!walker->get_recover) {
- struct each_ref_fn_sha1_adapter wrapped_mark_complete =
- {mark_complete, NULL};
-
- for_each_ref(each_ref_fn_adapter, &wrapped_mark_complete);
+ for_each_ref(mark_complete, NULL);
commit_list_sort_by_date(&complete);
}