Merge branch 'bp/merge-rename-config'

diff --git a/diff.c b/diff.c
index 5dfc24aa6dfd1222e350069eb7da862f86aac0bc..b2840231f36e8425bf06438ac4bd236a5ed7dc86 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -3638,7 +3638,8 @@ int diff_populate_filespec(struct diff_filespec *s, unsigned int flags)
        else {
                enum object_type type;
                if (size_only || (flags & CHECK_BINARY)) {
-                       type = oid_object_info(&s->oid, &s->size);
+                       type = oid_object_info(the_repository, &s->oid,
+                                              &s->size);
                        if (type < 0)
                                die("unable to read %s",
                                    oid_to_hex(&s->oid));