Merge fixes up to GIT 1.1.3

diff --git a/object.c b/object.c
index 427e14cae2deb42138a439f7b2d69d3e06bb9417..1577f74281be776082fecebdf8947bcb8c7c6802 100644 (file)
--- a/object.c
+++ b/object.c
@@ -1,8 +1,8 @@
+#include "cache.h"
 #include "object.h"
 #include "blob.h"
 #include "tree.h"
 #include "commit.h"
-#include "cache.h"
 #include "tag.h"
 
 struct object **objs;
@@ -82,7 +82,12 @@ static int compare_object_pointers(const void *a, const void *b)
 {
        const struct object * const *pa = a;
        const struct object * const *pb = b;
-       return *pa - *pb;
+       if (*pa == *pb)
+               return 0;
+       else if (*pa < *pb)
+               return -1;
+       else
+               return 1;
 }
 
 void set_object_refs(struct object *obj, struct object_refs *refs)