X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin-apply.c;h=c4978893122bbcfd80201fe937eb8433b29e1aa0;hb=06f60e8edf1eb3a91e1af6f255bf46154168dd86;hp=1540f28ab4acc7794796389237bcfeee1075b932;hpb=0dbaa5bd514b9d234c07fd6b857888566abcf836;p=git.git

diff --git a/builtin-apply.c b/builtin-apply.c
index 1540f28ab..c49788931 100644
--- a/builtin-apply.c
+++ b/builtin-apply.c
@@ -2985,11 +2985,11 @@ static int apply_patch(int fd, const char *filename, int inaccurate_eof)
 	return 0;
 }
 
-static int git_apply_config(const char *var, const char *value)
+static int git_apply_config(const char *var, const char *value, void *cb)
 {
 	if (!strcmp(var, "apply.whitespace"))
 		return git_config_string(&apply_default_whitespace, var, value);
-	return git_default_config(var, value);
+	return git_default_config(var, value, cb);
 }
 
 
@@ -3005,7 +3005,7 @@ int cmd_apply(int argc, const char **argv, const char *unused_prefix)
 
 	prefix = setup_git_directory_gently(&is_not_gitdir);
 	prefix_length = prefix ? strlen(prefix) : 0;
-	git_config(git_apply_config);
+	git_config(git_apply_config, NULL);
 	if (apply_default_whitespace)
 		parse_whitespace_option(apply_default_whitespace);