From: Junio C Hamano <gitster@pobox•com>
To: "Nguyễn Thái Ngọc Duy" <pclouds@gmail•com>
Cc: git@vger•kernel.org, Michal Stasa <michal.stasa@gmail•com>
Subject: Re: [PATCH] commit: switch core.commentChar if it's found in existing commit
Date: Fri, 16 May 2014 10:27:24 -0700 [thread overview]
Message-ID: <xmqqzjihab2b.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <1400237982-5842-1-git-send-email-pclouds@gmail.com> ("Nguyễn Thái Ngọc Duy"'s message of "Fri, 16 May 2014 17:59:42 +0700")
Nguyễn Thái Ngọc Duy <pclouds@gmail•com> writes:
> If we need to use core.commentChar and it's already in the prepared
> message, find another char among a small subset. This should stop
> surprises because git strips some lines unexpectedly. Of course if
> candicate characters happen to be all out, this change does not help.
>
> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail•com>
> ---
> On Fri, May 16, 2014 at 5:28 PM, Duy Nguyen <pclouds@gmail•com> wrote:
> > But maybe git should detect that the
> > current commit message has leading '#' and automatically switch to
> > another character..
>
> Something like this. Lightly tested.. I know there's a small bug..
>
> builtin/commit.c | 29 +++++++++++++++++++++++++++++
> 1 file changed, 29 insertions(+)
>
> diff --git a/builtin/commit.c b/builtin/commit.c
> index 6ab4605..70ceb61 100644
> --- a/builtin/commit.c
> +++ b/builtin/commit.c
> @@ -593,6 +593,32 @@ static char *cut_ident_timestamp_part(char *string)
> return ket;
> }
>
> +static void adjust_comment_line_char(const struct strbuf *sb)
> +{
> + char candidates[] = " !@#$%^&|:;~";
Did you really mean to add a SP to the candidates?
> + char *candidate;
> + const char *p;
> + if (!sb->len)
> + return;
> + candidates[0] = comment_line_char;
> + p = sb->buf;
> + do {
> + candidate = strchr(candidates, *p);
> + if (candidate)
> + *candidate = ' ';
> + p = strchrnul(p, '\n');
> + if (*p)
> + p++;
> + } while (*p);
> + if (strchr(candidates, comment_line_char)) {
> + p = candidates;
> + while (*p && *p == ' ')
> + p++;
> + if (*p)
> + comment_line_char = *p;
> + }
> +}
> +
> static int prepare_to_commit(const char *index_file, const char *prefix,
> struct commit *current_head,
> struct wt_status *s,
> @@ -748,6 +774,9 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
> if (fwrite(sb.buf, 1, sb.len, s->fp) < sb.len)
> die_errno(_("could not write commit template"));
>
> + if (use_editor && include_status)
> + adjust_comment_line_char(&sb);
> +
> strbuf_release(&sb);
>
> /* This checks if committer ident is explicitly given */
next prev parent reply other threads:[~2014-05-16 18:51 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 ` [PATCH 1/2] config: be strict on core.commentChar Felipe Contreras
2014-05-16 16:25 ` 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 ` Junio C Hamano [this message]
2014-05-16 18:53 ` [PATCH] commit: switch core.commentChar if it's found in existing commit 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=xmqqzjihab2b.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=michal.stasa@gmail$(echo .)com \
--cc=pclouds@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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