On Thu, Sep 22, 2011 at 11:41:34AM -0400, Jay Soffian wrote:
> Thank you for this thread. I was under the illusion that diff-tree
> --check considered in-tree .gitattributes, but the code seems to
> indicate otherwise. :-(
No, we definitely don't use in-tree gitattributes. IIRC, there are some
precedence and ordering questions. I think the ordering now is:
1. Look in $GIT_DIR/info/attributes
2. If not found, look in per-directory .gitattributes
3. If not found, look in core.gitattributesfile
Where do in-tree attributes fit in? Between 1 and 2? Or 2 and 3? And
which tree do we look at?
Here are some examples:
a. If I do "git checkout branch-foo", we should look at branch-foo's
tree for things like crlf, right? Do we still fall back to
per-directory .gitattributes in the working tree? On the one hand,
they're not really relevant to the commit we're moving to. But they
are respected in the current code, and can be useful when moving to
old commits which lack attributes.
I think this is where the index magic comes in in the current code
(we do something like "load the index, then respect gitattributes
from the index").
So maybe this is solved already.
b. You're diffing commit $a against commit $b. Whose gitattributes
have precedence? Is order important? Are gitattributes in the
working tree and index relevant?
c. You're diffing commit $a against HEAD. Which gitattributes have
precedence? Again, is order important (i.e., does "diff -R" look at
different attributes than "diff")?
I'm sure there are others, too. And I don't think any of these is
insurmountable. But somebody needs to think through a lot of cases and
come up with consistent, sane behavior that does the right thing in each
case (considering both bare repositories and ones with working trees).
-Peff
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html