Re: git diff bug?

From: Jeff King <peff@peff.net>
Date: Apr 6, 2009, 15:53 UTC
Message-ID: <20090406155303.GA3275@sigill.intra.peff.net>
In-Reply-To: <1BF9172A-BE91-4D1C-932A-EB9FD79BA402@boostpro.com>

On Mon, Apr 06, 2009 at 05:09:32AM -0400, David Abrahams wrote:

Show 7 quoted lines

> Hmm, so I tried sticking this .gitattributes in my repo
>
>   *.el   diff=el
>   [diff "el"]
>         xfuncname = "^(\\(def[a-z]+ .+)$"
>
> and git diff barfed with

As Michael explained, the first line goes into .gitattributes, and the second two go into your .git/config.

The reason is that the first line is describing a property of files in the repo: "*.el is of type 'el' for diffing". And thus it makes sense for it to be committed along with the content in the repo.

But the latter two lines are about preference: "here is how _I_ would like to generate diffs for el files". So they go in your personal config which is not shipped with the repo. And most likely you would want to put them not in per-repo config, but in your user config: $HOME/.gitconfig.

All of that being said, it is obviously a documentation failure if it didn't explain in which files the various parts go. If you don't mind, can you skim over the documentation you read one more time and point out where it led you wrong? Maybe we can make it a little clearer.

-Peff