Merge branch 'nd/pack-ofs-4gb-limit' into maint

diff --git a/cache.h b/cache.h
index c73becbf2dc8ae939116617e36c76afa60857cef..a4465cb6a2ab3da4b8b73d45cc6500275b8abecf 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -1508,7 +1508,7 @@ struct object_info {
        /* Request */
        enum object_type *typep;
        unsigned long *sizep;
-       unsigned long *disk_sizep;
+       off_t *disk_sizep;
        unsigned char *delta_base_sha1;
        struct strbuf *typename;