Merge branch 'jc/maint-1.6.0-keep-pack' into maint

diff --git a/diff.c b/diff.c
index 11798af0c190f369e8ac9cb0463f794bc3bb5d10..37f99209a0580a1ac304d0c1a8a55c12da64c9f2 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -1783,7 +1783,7 @@ static int reuse_worktree_file(const char *name, const unsigned char *sha1, int
         * objects however would tend to be slower as they need
         * to be individually opened and inflated.
         */
-       if (!FAST_WORKING_DIRECTORY && !want_file && has_sha1_pack(sha1, NULL))
+       if (!FAST_WORKING_DIRECTORY && !want_file && has_sha1_pack(sha1))
                return 0;
 
        len = strlen(name);