Merge branch 'jn/vcs-svn-cleanup' into next

diff --git a/read-cache.c b/read-cache.c
index 17f19a11ff40b425ba8aa73d6dc64a9d47fef300..9b4105856992859f3a1d7f4462843196aacdc484 100644 (file)
--- a/read-cache.c
+++ b/read-cache.c
@@ -161,7 +161,7 @@ static int ce_compare_data(const struct cache_entry *ce, struct stat *st)
 
        if (fd >= 0) {
                struct object_id oid;
-               if (!index_fd(oid.hash, fd, st, OBJ_BLOB, ce->name, 0))
+               if (!index_fd(&oid, fd, st, OBJ_BLOB, ce->name, 0))
                        match = oidcmp(&oid, &ce->oid);
                /* index_fd() closed the file descriptor already */
        }