Merge branch 'bw/protocol-v2'

diff --git a/diffcore-rename.c b/diffcore-rename.c
index 888a4b0189c00e3dcf99a3684afe88d62f7921b2..0b7e4989a87214faa22e4f8ec75a719d3fd857ae 100644 (file)
--- a/diffcore-rename.c
+++ b/diffcore-rename.c
@@ -260,8 +260,8 @@ static unsigned int hash_filespec(struct diff_filespec *filespec)
        if (!filespec->oid_valid) {
                if (diff_populate_filespec(filespec, 0))
                        return 0;
-               hash_sha1_file(filespec->data, filespec->size, "blob",
-                              filespec->oid.hash);
+               hash_object_file(filespec->data, filespec->size, "blob",
+                                &filespec->oid);
        }
        return sha1hash(filespec->oid.hash);
 }