From: Michael Haggerty <mhagger@alum.mit.edu>
Date: Mon, 25 May 2015 18:39:14 +0000 (+0000)
Subject: mark_complete(): rewrite to take an object_id argument
X-Git-Tag: v2.5.0-rc0~54^2~8
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/b4ebaf9eea30a38a0462ff72ea3e0aec0101bb7e?ds=sidebyside

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>
---

diff --git a/walker.c b/walker.c
index bb2e0b9328..44a936c1cf 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);
 	}