RE: [PATCH 1/2] config: be strict on core.commentChar

From: Felipe Contreras <felipe.contreras@gmail.com>
Date: May 16, 2014, 14:42 UTC
Message-ID: <537623bf5f850_149cac13044a@nysa.notmuch>
In-Reply-To: <1400248283-303-1-git-send-email-pclouds@gmail.com>

Nguyễn Thái Ngọc Duy wrote:

Show 30 quoted lines

> We don't support comment _strings_ (at least not yet). And multi-byte
> character encoding could also be misinterpreted.
> 
> The test with two commas is deleted because it violates this. It's
> added with the patch that introduces core.commentChar in eff80a9
> (Allow custom "comment char" - 2013-01-16). It's not clear to me _why_
> that behavior is wanted.
> 
> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
> ---
>  config.c          | 8 ++++++--
>  t/t7508-status.sh | 6 ------
>  2 files changed, 6 insertions(+), 8 deletions(-)
> 
> diff --git a/config.c b/config.c
> index a30cb5c..05d909b 100644
> --- a/config.c
> +++ b/config.c
> @@ -826,8 +826,12 @@ static int git_default_core_config(const char *var, const char *value)
>  	if (!strcmp(var, "core.commentchar")) {
>  		const char *comment;
>  		int ret = git_config_string(&comment, var, value);
> -		if (!ret)
> -			comment_line_char = comment[0];
> +		if (!ret) {
> +			if (comment[0] && !comment[1])
> +				comment_line_char = comment[0];
> +			else
> +				return error("core.commentChar should only be one character");
> +		}

Small nit:

  if (ret)
	  return ret;
  if (comment[0] && !comment[1])
	  comment_line_char = comment[0];
  else
	  return error("core.commentChar should only be one character");

-- 
Felipe Contreras