Merge branch 'rs/preserve-merges-unused-code-removal'

[thirdparty/git.git] / apply.c

diff --git a/apply.c b/apply.c
index c5ecb64102844897b3ca8b5f7c85159dc84066cf..57afee512071013f684916e9d5a51a2998407665 100644 (file)
--- a/apply.c
+++ b/apply.c
@@ -3178,7 +3178,7 @@ static int apply_binary(struct apply_state *state,
                return 0; /* deletion patch */
        }
 
-       if (has_object_file(&oid)) {
+       if (has_object(the_repository, &oid, 0)) {
                /* We already have the postimage */
                enum object_type type;
                unsigned long size;