From: Christian Couder <chriscool@tuxfamily.org>
Date: Sun, 13 Apr 2008 03:56:44 GMT
Subject: Re: [PATCH] builtin-apply.c: use git_config_string() to get apply_default_whitespace
Message-ID: <200804130556.45141.chriscool@tuxfamily.org>
In-Reply-To: <20080408084233.GA7785@leksak.fem-net>

Le mardi 8 avril 2008, Stephan Beyer a écrit :
> Signed-off-by: Stephan Beyer <s-beyer@gmx.net>
> ---
> Hi,
>
> a simple `Janitor patch'.

Thanks.

>
> Regards,
>  Stephan.
>
>  builtin-apply.c |    8 ++------
>  1 files changed, 2 insertions(+), 6 deletions(-)
>
> diff --git a/builtin-apply.c b/builtin-apply.c
> index b5f78ac..ce0a0c3 100644
> --- a/builtin-apply.c
> +++ b/builtin-apply.c
> @@ -2978,12 +2978,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);
>  }
>
> -- 
> 1.5.5.rc3.8.g78d1a

Tested-by: Christian Couder <chriscool@tuxfamily.org>

Junio, please apply.

Thanks,
Christian.