aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Beyer <s-beyer@gmx.net>2008-04-08 10:42:33 +0200
committerJunio C Hamano <gitster@pobox.com>2008-04-14 22:37:47 -0700
commit8e4c6aa1ac6e63d2fcee1825e32afbf4cb97206f (patch)
treee3c238b098909a09ff50b86f945d9a208db807a7
parentc35b0b5884a12685aa794e00f51bc7dfaa0dd91c (diff)
downloadgit-8e4c6aa1ac6e63d2fcee1825e32afbf4cb97206f.tar.gz
git-8e4c6aa1ac6e63d2fcee1825e32afbf4cb97206f.tar.xz
builtin-apply.c: use git_config_string() to get apply_default_whitespace
Signed-off-by: Stephan Beyer <s-beyer@gmx.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--builtin-apply.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/builtin-apply.c b/builtin-apply.c
index abe73a0f8..c8ca41b68 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);
}