git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Felipe Contreras <felipe.contreras@gmail.com>
To: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>, git@vger.kernel.org
Cc: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: RE: [PATCH 1/2] config: be strict on core.commentChar
Date: Fri, 16 May 2014 09:42:07 -0500	[thread overview]
Message-ID: <537623bf5f850_149cac13044a@nysa.notmuch> (raw)
In-Reply-To: <1400248283-303-1-git-send-email-pclouds@gmail.com>

Nguyễn Thái Ngọc Duy wrote:
> 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

  parent reply	other threads:[~2014-05-16 14:53 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-05-16 10:18 Fwd: [Bug] - Processing commit message after amend Michal Stasa
2014-05-16 10:28 ` Duy Nguyen
2014-05-16 10:34   ` Michal Stasa
2014-05-16 10:59   ` [PATCH] commit: switch core.commentChar if it's found in existing commit Nguyễn Thái Ngọc Duy
2014-05-16 13:51     ` [PATCH 1/2] config: be strict on core.commentChar Nguyễn Thái Ngọc Duy
2014-05-16 13:51       ` [PATCH 2/2] commit: allow core.commentChar=auto for character auto selection Nguyễn Thái Ngọc Duy
2014-05-16 16:40         ` Jonathan Nieder
2014-05-16 17:38           ` Junio C Hamano
2014-05-16 23:41           ` Duy Nguyen
2014-05-16 14:42       ` Felipe Contreras [this message]
2014-05-16 16:25       ` [PATCH 1/2] config: be strict on core.commentChar Jonathan Nieder
2014-05-16 17:36         ` Junio C Hamano
2014-05-17  1:52       ` [PATCH v2 " Nguyễn Thái Ngọc Duy
2014-05-17  1:52         ` [PATCH v2 2/2] commit: allow core.commentChar=auto for character auto selection Nguyễn Thái Ngọc Duy
2014-05-16 17:27     ` [PATCH] commit: switch core.commentChar if it's found in existing commit Junio C Hamano
2014-05-16 18:53       ` Junio C Hamano
2014-05-16 10:34 ` Fwd: [Bug] - Processing commit message after amend David Kastrup

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=537623bf5f850_149cac13044a@nysa.notmuch \
    --to=felipe.contreras@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=pclouds@gmail.com \
    /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).