git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Daniel Harding <dharding@living180.net>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: "brian m. carlson" <sandals@crustytoothpaste.net>, git@vger.kernel.org
Subject: Re: [PATCH 2/2] t3430: update to test with custom commentChar
Date: Tue, 10 Jul 2018 15:29:51 +0300	[thread overview]
Message-ID: <aa716d3f-6a80-e3fc-0172-1027fb85c792@living180.net> (raw)
In-Reply-To: <nycvar.QRO.7.76.6.1807092109440.75@tvgsbejvaqbjf.bet>

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
>>
>> and
>>
>> 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
>> not.
>>
>> [0]
>> https://github.com/git/git/blob/53f9a3e157dbbc901a02ac2c73346d375e24978c/sequencer.c#L2869
>> [1]
>> https://github.com/git/git/blob/53f9a3e157dbbc901a02ac2c73346d375e24978c/sequencer.c#L3797
> 
> 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
> changed.

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

  reply	other threads:[~2018-07-10 12:29 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-07-08 18:41 [PATCH 0/2] Fix --rebase-merges with custom commentChar Daniel Harding
2018-07-08 18:41 ` [PATCH 1/2] sequencer: fix " Daniel Harding
2018-07-08 18:41 ` [PATCH 2/2] t3430: update to test " Daniel Harding
2018-07-08 21:02   ` brian m. carlson
2018-07-09  7:52     ` Johannes Schindelin
2018-07-09 16:46       ` Junio C Hamano
2018-07-09 18:22       ` Daniel Harding
2018-07-09 19:09         ` Johannes Schindelin
2018-07-09 20:05         ` Junio C Hamano
2018-07-09 18:48     ` Daniel Harding
2018-07-09 19:14       ` Johannes Schindelin
2018-07-10 12:29         ` Daniel Harding [this message]
2018-07-10 13:08           ` Johannes Schindelin
2018-07-10 13:49             ` Daniel Harding
2018-10-02 14:38               ` Johannes Schindelin
2018-07-09 23:41       ` brian m. carlson
2018-07-09  7:53 ` [PATCH 0/2] Fix --rebase-merges " Johannes Schindelin
2018-07-10 13:24   ` Daniel Harding
2018-07-12  3:02     ` Aaron Schrab
2018-07-12 17:15       ` Junio C Hamano
2018-07-16  4:59         ` [PATCH v3] sequencer: use configured comment character Aaron Schrab
2018-07-16 15:59           ` Johannes Schindelin
2018-07-16 18:49             ` Daniel Harding
2018-07-17 16:46               ` Johannes Schindelin

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

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=aa716d3f-6a80-e3fc-0172-1027fb85c792@living180.net \
    --to=dharding@living180.net \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=sandals@crustytoothpaste.net \
    /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.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

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 read-only IMAP folder(s) and NNTP newsgroup(s).