From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 28 Dec 2009 06:59:55 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.0-rc0~138
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/67834b924044101a5d25f047746cfce7301bff1c?hp=1d85dd6fb2d5a05493dd11c6fb77ef2c04c79f43

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 1bbaf1cffb..9033dd3ab9 100644
--- 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,