From 8e4c6aa1ac6e63d2fcee1825e32afbf4cb97206f Mon Sep 17 00:00:00 2001
From: Stephan Beyer <s-beyer@gmx.net>
Date: Tue, 8 Apr 2008 10:42:33 +0200
Subject: [PATCH] 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>
---
builtin-apply.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/builtin-apply.c b/builtin-apply.c
index abe73a0f819..c8ca41b68f8 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);
}