Merge branch 'master' into next

diff --git a/sha1_file.c b/sha1_file.c
index b62d0e3dcd0c0142a025d202eec2f233932aed68..223001033c30eed20d7c5ee59719bffd25036ded 100644 (file)
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -1161,7 +1161,7 @@ int find_pack_entry_one(const unsigned char *sha1,
                int mi = (lo + hi) / 2;
                int cmp = memcmp(index + 24 * mi + 4, sha1, 20);
                if (!cmp) {
-                       e->offset = ntohl(*((int*)(index + 24 * mi)));
+                       e->offset = ntohl(*((unsigned int *)(index + 24 * mi)));
                        memcpy(e->sha1, sha1, 20);
                        e->p = p;
                        return 1;