aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-12-27 22:59:55 -0800
committerJunio C Hamano <gitster@pobox.com>2009-12-27 22:59:55 -0800
commit67834b924044101a5d25f047746cfce7301bff1c (patch)
tree083c58605f894c05a654b5fa08eb6f7c28e34069
parent1d85dd6fb2d5a05493dd11c6fb77ef2c04c79f43 (diff)
parent0622f79d8e7e91efc5870afe0ce134e1cee9f9f0 (diff)
downloadgit-67834b924044101a5d25f047746cfce7301bff1c.tar.gz
git-67834b924044101a5d25f047746cfce7301bff1c.tar.xz
Merge branch 'maint'
* maint: read_index(): fix reading extension size on BE 64-bit archs
-rw-r--r--read-cache.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/read-cache.c b/read-cache.c
index 1bbaf1cff..9033dd3ab 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,