summaryrefslogtreecommitdiff
path: root/builtin-apply.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-05-25 14:25:02 -0700
committerJunio C Hamano <gitster@pobox.com>2008-05-25 14:25:02 -0700
commit9bd81e4249a419f9cde8fd68e033e263533f4914 (patch)
tree5a4c77cc648dc720e40c76e83a489ab40e70e187 /builtin-apply.c
parent450c5aed06ecf60084f993f688b549ffa377b64e (diff)
parentef90d6d4208a5130185b04f06e5f90a5f9959fe3 (diff)
downloadgit-9bd81e4249a419f9cde8fd68e033e263533f4914.tar.gz
Merge branch 'js/config-cb'v1.5.6-rc0
* js/config-cb: Provide git_config with a callback-data parameter Conflicts: builtin-add.c builtin-cat-file.c
Diffstat (limited to 'builtin-apply.c')
-rw-r--r--builtin-apply.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin-apply.c b/builtin-apply.c
index 1540f28ab4..c497889312 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);