On Tue, Sep 21, 2010 at 02:56:13PM -0400, Jeff King wrote: > We are again acting on the symlink's contents, which are a text > pathname, as if they represented the content of that pathname. > > So I think that is a bug, albeit one that is relatively uncommon to > trigger. S_ISGITLINK files may have the same issues, but perhaps not, > as I think they get routed out of the regular diff codepath early. Here is a patch series to address this: [1/2]: diff: don't use pathname-based diff drivers for symlinks [2/2]: diff: add a special SYMLINK user-diff driver The first one fixes the bug. The second one is similar to what I posted before, but it may actually be more useful now, as it re-enables some dubious functionality that the first patch dropped (but in a more sane way). See the comments in each patch for details. -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