On Mon, Mar 19, 2018 at 09:49:28PM -0400, Dakota Hawkins wrote: > Summary: Trying to apply attributes to file extensions everywhere > except in one directory. > > .gitattributes: > > *.[Pp][Nn][Gg] filter=lfs diff=lfs merge=lfs -text > /.readme-docs/ -filter=lfs -diff=lfs -merge=lfs > > Make some data: > > echo "asldkjfa;sldkjf;alsdjf" > ./.readme-docs/test.png > git add -A
As you noted below, that second line does not match your path, because attributes on a directory aren't applied recursively. And it has nothing to do with overriding. If you remove the png line entirely, you can see that we still do not match it. You need to use "*" to match the paths. You may also find that "-diff=lfs" does not do quite what you want. There is no way to say "cancel any previous attribute", which I think is what you're trying for here. You can only override it with a new value. So: /.readme-docs/* -diff says "do not diff this". And: /.readme-docs/* diff says "diff this as text, even if it looks binary". The best you can probably do is: /.readme-docs/* diff=foo Since you have no diff.foo.* config, that will behave in the default way (including respecting the usual "is it binary" checks). So a bit hacky, but I think it would work as "ignore prior diff". And I think filter and merge drivers should work the same. > Is this me misunderstanding something in the documentation? I would > expect "./.readme-docs/" to match "./.readme-docs/test.png" and > override the earlier "*.[Pp][Nn][Gg]" attributes. > > I have found the following overrides to work in lieu of the directory match: > > /.readme-docs/* -filter=lfs -diff=lfs -merge=lfs > /.readme-docs/**/* -filter=lfs -diff=lfs -merge=lfs > > ...but I don't see a justification in the documentation for this > working and the original directory filter not working. I could not find anything useful in gitattributes(5). There's some old discussion here: https://public-inbox.org/git/slrnkldd3g.1l4....@majutsushi.net/ which makes it clear that attributes aren't recursive, but it's probably worth calling out in the documentation. In fact, I think the current documentation is a bit misleading in that it says "patterns are matched as in .gitignore", which is clearly not the case here. I think just "/.readme-docs/**" should be sufficient for your case. You could also probably write "*" inside ".readme-docs/.gitattributes", which may be simpler (you don't need "**" there because patterns without a slash are just matched directly against the basename). -Peff
