Sync with maint

diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index ad4de3517853892e979d43511e2e7260746c3ba9..26828c1d82bc9a997041cb464d4a3fde38e2d19d 100644 (file)
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -793,7 +793,8 @@ static void sha1_object(const void *data, struct object_entry *obj_entry,
 
        if (startup_info->have_repository) {
                read_lock();
-               collision_test_needed = has_sha1_file_with_flags(oid->hash, HAS_SHA1_QUICK);
+               collision_test_needed =
+                       has_sha1_file_with_flags(oid->hash, OBJECT_INFO_QUICK);
                read_unlock();
        }