Merge branch 'me/fetch-into-shallow-safety'

diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index 2ecfbae239c0d603aaf3359679bf3162dbd48767..48fa4724aa01b67fd53682e8db51c8013c5bc5fe 100644 (file)
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -786,7 +786,7 @@ static void sha1_object(const void *data, struct object_entry *obj_entry,
        assert(data || obj_entry);
 
        read_lock();
-       collision_test_needed = has_sha1_file(sha1);
+       collision_test_needed = has_sha1_file_with_flags(sha1, HAS_SHA1_QUICK);
        read_unlock();
 
        if (collision_test_needed && !data) {