Web lists-archives.com

Re: [PATCH 2/2] t3430: update to test with custom commentChar

On Mon, 09 Jul 2018 at 22:14:58 +0300, Johannes Schindelin wrote:

On Mon, 9 Jul 2018, Daniel Harding wrote:

On Mon, 09 Jul 2018 at 00:02:00 +0300, brian m. carlson wrote:
Should this affect the "# Merge the topic branch" line (and the "# C",
"# E", and "# H" lines in the next test) that appears below this?  It
would seem those would qualify as comments as well.

I intentionally did not change that behavior for two reasons:

a) from a Git perspective, comment characters are only effectual for comments
if they are the first character in a line


b) there are places where a '#' character from the todo list is actually
parsed and used e.g. [0] and [1].  I have not yet gotten to the point of
grokking what is going on there, so I didn't want to risk breaking something I
didn't understand.  Perhaps Johannes could shed some light on whether the
cases you mentioned should be changed to use the configured commentChar or


These are related. The first one tries to support

	merge -C cafecafe second-branch third-branch # Octopus 2nd/3rd branch

i.e. use '#' to separate between the commit(s) to merge and the oneline
(the latter for the reader's pleasure, just like the onelines in the `pick
<hash> <oneline>` lines.

The second ensures that there is no valid label `#`.

I have not really thought about the ramifications of changing this to
comment_line_char, but I guess it *could* work if both locations were

Is there interest in such a change? I'm happy to take a stab at it if there is, otherwise I'll leave things as they are.

Daniel Harding