Re: What's cooking in git.git (Sep 2011, #04; Mon, 12)

From: Junio C Hamano <gitster@pobox.com>
Date: Sep 12, 2011, 23:25 UTC
Message-ID: <7vwrdd1gyc.fsf@alter.siamese.dyndns.org>
In-Reply-To: <4E6E928A.6080003@sunshineco.com>

Eric Sunshine <sunshine@sunshineco.com> writes:

Show 13 quoted lines

> The following extensions I mentioned are missing from jk/default-attr:
>
> 	"*.htm diff=html",
> 	"*.cpp diff=cpp",
> 	"*.mm diff=objc",
>
> On Windows, .htm is common, and .cpp is required by several Windows
> C++ compilers. On Mac OS X, .mm is used for Objective-C++. The other
> extensions I mentioned (.cs, .hpp, .m) are present in jk/default-attr.
>
> Peff also asked if uppercase extensions are common on Windows. They
> are, so one often sees .HTM, .HTML, etc. Should this issue be handled
> by jk/default-attr?

I do not think we would mind adding .HTM but would people limit themselves to uppercase while not limiting themselves to three letters and use .HTML?

Show 14 quoted lines

> By the way, there appears to be an error in 1ff2bcf79b (attr: map
> builtin userdiff drivers to well-known extensions, 2011-08-25):
>
>> static const char *builtin_attr[] = {
>>  	"[attr]binary -diff -text",
>> +	"*.html diff=html",
>> 	...omitted...
>> +	"*.f[0-9][0-9] diff=fortran",
>> +	"*.m objc",
>>  	NULL,
>
> Shouldn't the last entry be?
>
> 	"*.m diff=objc",

Thanks for spotting. I'll locally amend only this part and hope somebody would volunteer to submit an agreed version as the final one ;-)