On Tue, Jan 10, 2012 at 10:01:34AM +0100, Michael Haggerty wrote: > On 01/10/2012 08:03 AM, Jeff King wrote: > > I'm seeing some very odd behavior with git's attribute expansion for > > diffs. You can see it with this repository: > > > > git clone git://github.com/libgit2/libgit2sharp.git > > > > Try a diff of a non-binary file: [...] > > The problem has nothing with diffing; simply interrogating the attribute > values gives different results depending on the order of the files: > > $ git check-attr --all Lib/NativeBinaries/x86/git2.dll > LibGit2Sharp/Configuration.cs > Lib/NativeBinaries/x86/git2.dll: binary: set > Lib/NativeBinaries/x86/git2.dll: diff: unset > Lib/NativeBinaries/x86/git2.dll: text: unset > LibGit2Sharp/Configuration.cs: binary: set > LibGit2Sharp/Configuration.cs: diff: unset > LibGit2Sharp/Configuration.cs: text: unset > LibGit2Sharp/Configuration.cs: crlf: set > $ git check-attr --all LibGit2Sharp/Configuration.cs > Lib/NativeBinaries/x86/git2.dll > LibGit2Sharp/Configuration.cs: diff: csharp > LibGit2Sharp/Configuration.cs: crlf: set > Lib/NativeBinaries/x86/git2.dll: binary: set > Lib/NativeBinaries/x86/git2.dll: diff: unset > Lib/NativeBinaries/x86/git2.dll: text: unset Thanks. I tried to test it with check-attr but for some reason wasn't able to provoke the bug (I think I probably just screwed up the invocation). > It also doesn't depend on the fact that Lib/.gitattributes uses CRLF as > its EOL, nor does it depend on the use of the "binary" macro. However, > it does depend on the fact that the directory name "Lib" matches the > first part of the directory name "LibGit2Sharp". Here is a simplified > demonstration of the problem: Ah, very helpful. That allowed me to find the problem very quickly by grepping for "strncmp". :) The patch below seem to fix it for me. I'll do a bit more testing before posting it for real, though. -Peff diff --git a/attr.c b/attr.c index 7467baf..f4beb62 100644 --- a/attr.c +++ b/attr.c @@ -528,7 +528,8 @@ static void prepare_attr_stack(const char *path, int dirlen) elem = attr_stack; if (namelen <= dirlen && - !strncmp(elem->origin, path, namelen)) + !strncmp(elem->origin, path, namelen) && + (!namelen || path[namelen] == '/' || path[namelen] == '\0')) break; debug_pop(elem); -- 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