Merge branch 'sg/cvs-tests-with-x'

diff --git a/http-push.c b/http-push.c
index 0913f8ab860246f990536fd20794ac6230daf50a..7dcd9daf62cf07e1cc43022fde17607cef6dc147 100644 (file)
--- a/http-push.c
+++ b/http-push.c
@@ -362,7 +362,7 @@ static void start_put(struct transfer_request *request)
        git_zstream stream;
 
        unpacked = read_sha1_file(request->obj->oid.hash, &type, &len);
-       hdrlen = xsnprintf(hdr, sizeof(hdr), "%s %lu", typename(type), len) + 1;
+       hdrlen = xsnprintf(hdr, sizeof(hdr), "%s %lu", type_name(type), len) + 1;
 
        /* Set it up */
        git_deflate_init(&stream, zlib_compression_level);