builtin-apply.c: use git_config_string() to get apply_default_whitespace
authorStephan Beyer <s-beyer@gmx.net>
Tue, 8 Apr 2008 08:42:33 +0000 (10:42 +0200)
committerJunio C Hamano <gitster@pobox.com>
Tue, 15 Apr 2008 05:37:47 +0000 (22:37 -0700)
Signed-off-by: Stephan Beyer <s-beyer@gmx.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin-apply.c

index abe73a0f8194e95c2a10a27c2007560e6d57f3d5..c8ca41b68f8febb4856e3d6cc9a0ebef0a0a9973 100644 (file)
@@ -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);
 }