From: Daniel Harding <dharding@living180.net>
To: "brian m. carlson" <sandals@crustytoothpaste.net>
Cc: git@vger.kernel.org, Johannes Schindelin <Johannes.Schindelin@gmx.de>
Subject: Re: [PATCH 2/2] t3430: update to test with custom commentChar
Date: Mon, 9 Jul 2018 21:48:55 +0300 [thread overview]
Message-ID: <1084a573-4ed5-5a8c-a159-7773f7465704@living180.net> (raw)
In-Reply-To: <20180708210200.GA4573@genre.crustytoothpaste.net>
Hello brian,
On Mon, 09 Jul 2018 at 00:02:00 +0300, brian m. carlson wrote:
> On Sun, Jul 08, 2018 at 09:41:11PM +0300, Daniel Harding wrote:
>> Signed-off-by: Daniel Harding <dharding@living180.net>
>
>> diff --git a/t/t3430-rebase-merges.sh b/t/t3430-rebase-merges.sh
>> index 78f7c9958..ff474d033 100755
>> --- a/t/t3430-rebase-merges.sh
>> +++ b/t/t3430-rebase-merges.sh
>> @@ -56,12 +56,12 @@ test_expect_success 'create completely different structure' '
>> cat >script-from-scratch <<-\EOF &&
>> label onto
>>
>> - # onebranch
>> + > onebranch
>> pick G
>> pick D
>> label onebranch
>>
>> - # second
>> + > second
>> reset onto
>> pick B
>> label second
>
> 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
Thanks,
Daniel Harding
next prev parent reply other threads:[~2018-07-09 18:49 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 [this message]
2018-07-09 19:14 ` Johannes Schindelin
2018-07-10 12:29 ` Daniel Harding
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1084a573-4ed5-5a8c-a159-7773f7465704@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.
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).