Merge branch 'nd/bisect-show-list-fix'

diff --git a/diffcore-rename.c b/diffcore-rename.c
index d775183c2fd1bed06a97facb56c4721e4e5df2f6..daddd9b28af1e20fe82aefa654bad04f4b52c1d3 100644 (file)
--- a/diffcore-rename.c
+++ b/diffcore-rename.c
@@ -286,7 +286,7 @@ static int find_identical_files(struct hashmap *srcs,
                struct diff_filespec *source = p->filespec;
 
                /* False hash collision? */
-               if (oidcmp(&source->oid, &target->oid))
+               if (!oideq(&source->oid, &target->oid))
                        continue;
                /* Non-regular files? If so, the modes must match! */
                if (!S_ISREG(source->mode) || !S_ISREG(target->mode)) {