Merge branch 'sb/read-cache-one-indent-style-fix'

diff --git a/reachable.c b/reachable.c
index 69fa6851da8a37540da66faf96c7bc878fdc53c9..9cff25b490f7ec7c5535647afe017326a6984520 100644 (file)
--- a/reachable.c
+++ b/reachable.c
@@ -22,9 +22,10 @@ static void update_progress(struct connectivity_progress *cp)
                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;
 
        add_pending_object(revs, object, "");