From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: Boaz Harrosh <bharrosh@panasas.com>, git@vger.kernel.org
Subject: Re: [RFC/PATCH] attr: map builtin userdiff drivers to well-known extensions
Date: Thu, 25 Aug 2011 15:57:06 -0700 [thread overview]
Message-ID: <7v8vqhhzgd.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <20110825204047.GA9948@sigill.intra.peff.net> (Jeff King's message of "Thu, 25 Aug 2011 16:40:47 -0400")
Jeff King <peff@peff.net> writes:
> If you have any matching attribute line in your own files, it should
> override. So:
>
> foo/* -diff
>
> will still mark foo/bar.c as binary, even with this change.
>
> Can anyone think of other possible side effects?
>
> Also, any other extensions that would go into such a list? I have no
> idea what the common extension is for something like pascal or csharp.
As long as the builtin ones are the lowest priority fallback, we should be
Ok.
Do we say anywhere that "Ah, this has 'diff' attribute defined, so it must
be text"? If so, we should fix _that_. In other words, having this one
extra entry
"* diff=default"
in the builtin_attr[] array should be a no-op, I think.
>
> attr.c | 12 ++++++++++++
> 1 files changed, 12 insertions(+), 0 deletions(-)
>
> diff --git a/attr.c b/attr.c
> index da29c8e..5118a14 100644
> --- a/attr.c
> +++ b/attr.c
> @@ -294,6 +294,18 @@ static void free_attr_elem(struct attr_stack *e)
>
> static const char *builtin_attr[] = {
> "[attr]binary -diff -text",
> + "*.html diff=html",
> + "*.java diff=java",
> + "*.perl diff=perl",
> + "*.pl diff=perl",
> + "*.php diff=php",
> + "*.py diff=python",
> + "*.rb diff=ruby",
> + "*.bib diff=bibtex",
> + "*.tex diff=tex",
> + "*.c diff=cpp",
> + "*.cc diff=cpp",
> + "*.cxx diff=cpp",
> NULL,
> };
next prev parent reply other threads:[~2011-08-25 22:57 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-25 19:14 git diff annoyance / feature request Boaz Harrosh
2011-08-25 20:00 ` Jeff King
2011-08-25 20:40 ` [RFC/PATCH] attr: map builtin userdiff drivers to well-known extensions Jeff King
2011-08-25 21:00 ` Eric Sunshine
2011-08-25 21:06 ` Jeff King
2011-08-25 22:01 ` Boaz Harrosh
2011-08-25 23:44 ` Eric Sunshine
2011-08-26 2:39 ` Jeff King
2011-08-25 22:29 ` Brandon Casey
2011-08-26 2:45 ` Jeff King
2011-08-26 3:58 ` Eric Sunshine
2011-08-26 15:33 ` Brandon Casey
2011-08-25 22:57 ` Junio C Hamano [this message]
2011-08-26 2:59 ` Jeff King
2011-08-26 5:52 ` Junio C Hamano
2011-08-26 9:44 ` Thomas Rast
2011-08-27 5:14 ` Alexey Shumkin
2011-08-25 20:27 ` git diff annoyance / feature request Junio C Hamano
2011-08-25 21:58 ` Boaz Harrosh
2011-08-26 9:08 ` Miles Bader
2011-08-26 21:16 ` René Scharfe
2011-08-26 21:37 ` Boaz Harrosh
2011-08-26 21:52 ` 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=7v8vqhhzgd.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=bharrosh@panasas.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.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).