Re: [RFC PATCH] userdiff: ship built-in driver config file

From: Johannes Sixt <j6t@kdbg.org>
Date: Jun 18, 2019, 20:50 UTC
Message-ID: <1856d6bc-2cc5-6759-0ed9-8e4d46b6cc47@kdbg.org>
In-Reply-To: <488f215a-cb32-db3f-4a45-0062f0f0a0a9@kdbg.org>

Am 18.06.19 um 22:32 schrieb Johannes Sixt:

Show 7 quoted lines

> Am 17.06.19 um 18:54 schrieb Boxuan Li:
>> The userdiff.c has been rewritten to avoid hard-coded built-in
>> driver patterns. Now we ship
>> $(sharedir)/git-core/templates/userdiff that can be read using
>> git_config_from_file() interface, using a very narrow callback
>> function that understands only diff.*.xfuncname,
>> diff.*.wordregex, and diff.*.regIcase.

I forgot to thank you for working on this. It is much appreciated.

Show 9 quoted lines

>>
>> Signed-off-by: Boxuan Li <liboxuan@connect.hku.hk>
>> ---
>> A few notes and questions:
>> 1. In [diff "tex"] section, \x80 and \xff cannot be parsed by git config parser.
>> I have no idea why this is happening. I changed them to \\x80 and \\xff as a workaround, which
>> resulted in t4034 failure (See https://travis-ci.org/li-boxuan/git/jobs/546729906#L4679).
> 
> I guess, the idea is...

I think you noticed that I read the patch top-to-bottom and understood the gist of it only near the end.

-- Hannes