Merge branch 'sb/merge-recursive-code-cleanup'

diff --git a/server-info.c b/server-info.c
index e01ac154a843ddf72737ffa45704e3940edab229..5ec5b1d827a54486c83efc802ebc6eb1f40062c4 100644 (file)
--- a/server-info.c
+++ b/server-info.c
@@ -53,7 +53,7 @@ static int add_info_ref(const char *path, const struct object_id *oid,
                        int flag, void *cb_data)
 {
        FILE *fp = cb_data;
-       struct object *o = parse_object(oid->hash);
+       struct object *o = parse_object(oid);
        if (!o)
                return -1;