From: Eric Sunshine <sunshine@sunshineco.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Jeff King <peff@peff.net>,
git@vger.kernel.org, Boaz Harrosh <bharrosh@panasas.com>,
Brandon Casey <brandon.casey.ctr@nrlssc.navy.mil>,
Thomas Rast <trast@student.ethz.ch>,
Alexey Shumkin <zapped@mail.ru>
Subject: Re: What's cooking in git.git (Sep 2011, #04; Mon, 12)
Date: Mon, 12 Sep 2011 19:15:22 -0400 [thread overview]
Message-ID: <4E6E928A.6080003@sunshineco.com> (raw)
In-Reply-To: <7vk49d5t8u.fsf@alter.siamese.dyndns.org>
On 9/12/2011 5:46 PM, Junio C Hamano wrote:
> Junio C Hamano<gitster@pobox.com> writes:
>
>> [Stalled]
>>
>> * jk/default-attr (2011-08-26) 1 commit
>> - attr: map builtin userdiff drivers to well-known extensions
>>
>> Not urgent; I fixed up the test breakage just for fun.
>
> Could people who participated in the discussion make sure what is queued
> includes their favorite extensions they proposed?
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?
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",
(note the missing 'diff=')
-- ES
next prev parent reply other threads:[~2011-09-12 23:15 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-12 20:16 What's cooking in git.git (Sep 2011, #04; Mon, 12) Junio C Hamano
2011-09-12 21:48 ` Junio C Hamano
2011-09-12 21:51 ` Junio C Hamano
2011-09-12 23:27 ` Jeff King
2011-09-13 0:09 ` Junio C Hamano
2011-09-13 9:24 ` Nguyen Thai Ngoc Duy
2011-09-12 21:53 ` Junio C Hamano
2011-09-13 7:32 ` [PATCH v2] Documentation: basic configuration of notes.rewriteRef Thomas Rast
2011-09-13 17:16 ` Junio C Hamano
2011-09-13 17:18 ` Jeff King
2011-09-12 21:55 ` What's cooking in git.git (Sep 2011, #04; Mon, 12) Junio C Hamano
2011-09-12 21:59 ` Junio C Hamano
2011-09-14 2:34 ` Jonathon Mah
2011-09-14 20:57 ` Junio C Hamano
2011-09-16 2:12 ` [PATCH] mergetool: Use args as pathspec to unmerged files Jonathon Mah
2011-09-16 20:17 ` Junio C Hamano
2011-09-25 0:45 ` David Aguilar
2011-09-26 16:40 ` Junio C Hamano
2011-09-12 22:02 ` What's cooking in git.git (Sep 2011, #04; Mon, 12) Junio C Hamano
2011-09-12 23:15 ` Sverre Rabbelier
2011-09-12 22:56 ` Junio C Hamano
2011-09-13 9:46 ` Erik Faye-Lund
2011-09-29 12:03 ` Pascal Obry
2011-09-12 22:58 ` Junio C Hamano
2011-09-13 12:05 ` Michael J Gruber
[not found] ` <7vk49d5t8u.fsf@alter.siamese.dyndns.org>
2011-09-12 23:15 ` Eric Sunshine [this message]
2011-09-12 23:25 ` Junio C Hamano
2011-09-12 23:33 ` Jeff King
2011-09-12 23:53 ` Jeff King
2011-09-13 15:15 ` Brandon Casey
2011-09-13 16:05 ` Jeff King
2011-09-13 16:22 ` Brandon Casey
2011-09-13 7:51 ` John Szakmeister
2011-09-13 15:04 ` Eric Sunshine
2011-09-13 17:20 ` Jeff King
2011-09-12 23:35 ` Junio C Hamano
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=4E6E928A.6080003@sunshineco.com \
--to=sunshine@sunshineco.com \
--cc=bharrosh@panasas.com \
--cc=brandon.casey.ctr@nrlssc.navy.mil \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
--cc=trast@student.ethz.ch \
--cc=zapped@mail.ru \
/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).