difftool: fallback on merge.guitool

diff --git a/object.c b/object.c
index 51c45945156c421ada403139faefdf145918f4f7..e54160550c5a8e864f2e2bbcc58a29ff73045f8f 100644 (file)
--- a/object.c
+++ b/object.c
@@ -95,7 +95,7 @@ struct object *lookup_object(struct repository *r, const unsigned char *sha1)
 
        first = i = hash_obj(sha1, r->parsed_objects->obj_hash_size);
        while ((obj = r->parsed_objects->obj_hash[i]) != NULL) {
-               if (!hashcmp(sha1, obj->oid.hash))
+               if (hasheq(sha1, obj->oid.hash))
                        break;
                i++;
                if (i == r->parsed_objects->obj_hash_size)