git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Christian Couder <chriscool@tuxfamily.org>
To: Junio C Hamano <gitster@pobox.com>, Stephan Beyer <s-beyer@gmx.net>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] builtin-apply.c: use git_config_string() to get apply_default_whitespace
Date: Sun, 13 Apr 2008 05:56:44 +0200	[thread overview]
Message-ID: <200804130556.45141.chriscool@tuxfamily.org> (raw)
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.

  reply	other threads:[~2008-04-13  3:52 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-04-08  8:42 [PATCH] builtin-apply.c: use git_config_string() to get apply_default_whitespace Stephan Beyer
2008-04-13  3:56 ` Christian Couder [this message]
2008-04-13  6:26   ` Re* " Junio C Hamano
2008-04-15  4:19     ` Christian Couder

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=200804130556.45141.chriscool@tuxfamily.org \
    --to=chriscool@tuxfamily.org \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=s-beyer@gmx.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).