Merge branch 'ss/msvc' into maint

diff --git a/server-info.c b/server-info.c
index c82e9ee3964a17b23809c28d7cd14961e3e61d87..5a86e297b51261b5f1ae9fa6dad6fa7dc86cd4ba 100644 (file)
--- a/server-info.c
+++ b/server-info.c
@@ -62,7 +62,7 @@ static int add_info_ref(const char *path, const struct object_id *oid,
                o = deref_tag(o, path, 0);
                if (o)
                        if (fprintf(fp, "%s     %s^{}\n",
-                               sha1_to_hex(o->sha1), path) < 0)
+                               oid_to_hex(&o->oid), path) < 0)
                                return -1;
        }
        return 0;