Merge branch 'jc/diff' into next

diff --git a/pack-objects.c b/pack-objects.c
index 21ee572f48287b36628a027ab265ab58b85c90af..136a7f5aad61e8a90866ee7d0b4bc22e387f0396 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 long ui = (unsigned long)(long)p;
+       unsigned long ui = (unsigned long)p;
        int i;
 
        ui = ui ^ (ui >> 16); /* defeat structure alignment */