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

From: Daniel Harding <dharding@living180.net>
Date: Jul 9, 2018, 18:48 UTC
Message-ID: <1084a573-4ed5-5a8c-a159-7773f7465704@living180.net>
In-Reply-To: <20180708210200.GA4573@genre.crustytoothpaste.net>

Hello brian,

On Mon, 09 Jul 2018 at 00:02:00 +0300, brian m. carlson wrote:

Show 26 quoted lines

> 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