Merge branch 'maint'

* maint:
read_index(): fix reading extension size on BE 64-bit archs

diff --git a/read-cache.c b/read-cache.c
index 1bbaf1cffba3058667787fc4a267b87e21a6cad3..9033dd3ab938e2ee7b4248ff97645414ee3688db 100644 (file)
--- a/read-cache.c
+++ b/read-cache.c
@@ -1322,7 +1322,7 @@ int read_index_from(struct index_state *istate, const char *path)
                 * extension name (4-byte) and section length
                 * in 4-byte network byte order.
                 */
-               unsigned long extsize;
+               uint32_t extsize;
                memcpy(&extsize, (char *)mmap + src_offset + 4, 4);
                extsize = ntohl(extsize);
                if (read_index_extension(istate,