Merge branch 'master' of git://github.com/alshopov/git-po

diff --git a/fast-import.c b/fast-import.c
index 95600c78e048f9d3d28672737d4bc2a941073abc..69886687ce95fd7dfe5363d0c776e21241b6b830 100644 (file)
--- a/fast-import.c
+++ b/fast-import.c
@@ -2955,8 +2955,8 @@ static void cat_blob(struct object_entry *oe, struct object_id *oid)
                die("Object %s is a %s but a blob was expected.",
                    oid_to_hex(oid), type_name(type));
        strbuf_reset(&line);
-       strbuf_addf(&line, "%s %s %lu\n", oid_to_hex(oid),
-                                               type_name(type), size);
+       strbuf_addf(&line, "%s %s %"PRIuMAX"\n", oid_to_hex(oid),
+                   type_name(type), (uintmax_t)size);
        cat_blob_write(line.buf, line.len);
        strbuf_release(&line);
        cat_blob_write(buf, size);