Rip out merge-order and make "git log <paths>..." work again.

diff --git a/pack-objects.c b/pack-objects.c
index be7a2008c52f582626dd18b47372a4765c8bd39c..21ee572f48287b36628a027ab265ab58b85c90af 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 */
@@ -768,7 +768,7 @@ static int sha1_sort(const struct object_entry *a, const struct object_entry *b)
        return memcmp(a->sha1, b->sha1, 20);
 }
 
-static struct object_entry **create_final_object_list()
+static struct object_entry **create_final_object_list(void)
 {
        struct object_entry **list;
        int i, j;