From: Junio C Hamano <gitster@pobox.com>
To: Aaron Schrab <aaron@schrab.com>
Cc: git@vger.kernel.org, Johannes Schindelin <Johannes.Schindelin@gmx.de>
Subject: Re: [PATCH] sequencer: use configured comment character
Date: Thu, 28 Jun 2018 13:38:15 -0700 [thread overview]
Message-ID: <xmqqh8lmwsso.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <20180628020414.25036-1-aaron@schrab.com> (Aaron Schrab's message of "Wed, 27 Jun 2018 22:04:14 -0400")
Aaron Schrab <aaron@schrab.com> writes:
> Use configured comment character when generating comments about branches
> in an instruction sheet. Failure to honor this configuration causes a
> failure to parse the resulting instruction sheet.
>
> Signed-off-by: Aaron Schrab <aaron@schrab.com>
> ---
> sequencer.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/sequencer.c b/sequencer.c
> index 4034c0461b..caf91af29d 100644
> --- a/sequencer.c
> +++ b/sequencer.c
> @@ -3991,7 +3991,7 @@ static int make_script_with_merges(struct pretty_print_context *pp,
> entry = oidmap_get(&state.commit2label, &commit->object.oid);
>
> if (entry)
> - fprintf(out, "\n# Branch %s\n", entry->string);
> + fprintf(out, "\n%c Branch %s\n", comment_line_char, entry->string);
> else
> fprintf(out, "\n");
Would this interact OK with core.commentchar set to "auto"?
next prev parent reply other threads:[~2018-06-28 20:38 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-28 2:04 [PATCH] sequencer: use configured comment character Aaron Schrab
2018-06-28 9:57 ` Johannes Schindelin
2018-06-28 20:38 ` Junio C Hamano [this message]
2018-06-29 14:12 ` Johannes Schindelin
2018-06-29 15:56 ` Junio C Hamano
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=xmqqh8lmwsso.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=aaron@schrab.com \
--cc=git@vger.kernel.org \
/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).