Merge branch 'hn/refs-ref-log-only-bit'

[thirdparty/git.git] / apply.c

diff --git a/apply.c b/apply.c
index c5ecb64102844897b3ca8b5f7c85159dc84066cf..76dba93c974b3814117e3856d875e7e4381d2f62 100644 (file)
--- a/apply.c
+++ b/apply.c
@@ -30,8 +30,8 @@ struct gitdiff_data {
 
 static void git_apply_config(void)
 {
-       git_config_get_string_const("apply.whitespace", &apply_default_whitespace);
-       git_config_get_string_const("apply.ignorewhitespace", &apply_default_ignorewhitespace);
+       git_config_get_string("apply.whitespace", &apply_default_whitespace);
+       git_config_get_string("apply.ignorewhitespace", &apply_default_ignorewhitespace);
        git_config(git_xmerge_config, NULL);
 }
 
@@ -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;