merge: remove drop_save() in favor of remove_merge_branch_state()

diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index ac1f4ea9a782508e89f269bb1bf000a4a805c793..31046c7a0a3776fe61e81c30e83f4139e980e1c8 100644 (file)
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -772,7 +772,7 @@ 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, OBJECT_INFO_QUICK);
+                       has_object_file_with_flags(oid, OBJECT_INFO_QUICK);
                read_unlock();
        }