Merge branch 'jh/trace2-pretty-output'

diff --git a/diffcore-rename.c b/diffcore-rename.c
index 6af92d5eba6584416d331c2f6e63bd7d403ca773..9624864858dcb4e99d793858c3fe4885d18134e3 100644 (file)
--- a/diffcore-rename.c
+++ b/diffcore-rename.c
@@ -266,7 +266,7 @@ static unsigned int hash_filespec(struct repository *r,
                hash_object_file(filespec->data, filespec->size, "blob",
                                 &filespec->oid);
        }
-       return sha1hash(filespec->oid.hash);
+       return oidhash(&filespec->oid);
 }
 
 static int find_identical_files(struct hashmap *srcs,