X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin-apply.c;h=caa3f2aa0ca147091d28013c3d2c11346e350675;hb=498a6e7eaaa8d2641f7cc343e1557e1502437b33;hp=30d26e57b30821d6b11efe4f493da6d35fb1dc18;hpb=464509f790f409d95e0820364ef7296d82942d8c;p=git.git diff --git a/builtin-apply.c b/builtin-apply.c index 30d26e57b..caa3f2aa0 100644 --- a/builtin-apply.c +++ b/builtin-apply.c @@ -2981,12 +2981,8 @@ static int apply_patch(int fd, const char *filename, int inaccurate_eof) static int git_apply_config(const char *var, const char *value) { - if (!strcmp(var, "apply.whitespace")) { - if (!value) - return config_error_nonbool(var); - apply_default_whitespace = xstrdup(value); - return 0; - } + if (!strcmp(var, "apply.whitespace")) + return git_config_string(&apply_default_whitespace, var, value); return git_default_config(var, value); }