• David Aguilar's avatar
    difftool: ignore symbolic links in use_wt_file · cfe2d4be
    David Aguilar authored
    The caller is preparing a narrowed-down copy of the working tree and
    this function is asked if the path should be included in that copy.
    If we say yes, the path from the working tree will be either symlinked
    or copied into the narrowed-down copy.
    For any path that is a symbolic link, the caller later fixes up the
    narrowed-down copy by unlinking the path and replacing it with a
    regular file it writes out that mimics the way how "git diff"
    compares symbolic links.
    Let's answer "no, you do not want to copy/symlink the working tree
    file" for all symbolic links from this function, as we know the
    result will not be used because it will be overwritten anyway.
    Incidentally, this also stops the function from feeding a symbolic
    link in the working tree to hash-object, which is a wrong thing to
    do to begin with. The link may be pointing at a directory, or worse
    may be dangling (both would be noticed as an error).  Even if the
    link points at a regular file, hashing the contents of a file that
    is pointed at by the link is not correct (Git hashes the contents of
    the link itself, not the pointee).
    Signed-off-by: David Aguilar's avatarDavid Aguilar <davvid@gmail.com>
    Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
git-difftool.perl 13.2 KB