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

diff --git a/server-info.c b/server-info.c
index 34b0253177a0e6d09e317064cd3ec31e26002520..c82e9ee3964a17b23809c28d7cd14961e3e61d87 100644 (file)
--- a/server-info.c
+++ b/server-info.c
@@ -47,14 +47,15 @@ static int update_info_file(char *path, int (*generate)(FILE *))
        return ret;
 }
 
-static int add_info_ref(const char *path, const unsigned char *sha1, int flag, void *cb_data)
+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(sha1);
+       struct object *o = parse_object(oid->hash);
        if (!o)
                return -1;
 
-       if (fprintf(fp, "%s     %s\n", sha1_to_hex(sha1), path) < 0)
+       if (fprintf(fp, "%s     %s\n", oid_to_hex(oid), path) < 0)
                return -1;
 
        if (o->type == OBJ_TAG) {