Merge branch 'master' into next

diff --git a/pack-objects.c b/pack-objects.c
index be7a2008c52f582626dd18b47372a4765c8bd39c..0287449b4ce365eaa134815d34522fdf8495dbe7 100644 (file)
--- a/pack-objects.c
+++ b/pack-objects.c
@@ -99,7 +99,7 @@ static int reused_delta = 0;
 
 static int pack_revindex_ix(struct packed_git *p)
 {
-       unsigned int ui = (unsigned int) p;
+       unsigned long ui = (unsigned long)(long)p;
        int i;
 
        ui = ui ^ (ui >> 16); /* defeat structure alignment */