From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 4 Dec 2015 19:34:24 +0000 (-0800)
Subject: Merge branch 'da/difftool' into maint
X-Git-Tag: v2.6.4~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=aa0b4c31d9f21b806253ac16e59de82e2a5ec00e;p=thirdparty%2Fgit.git

Merge branch 'da/difftool' into maint

The code to prepare the working tree side of temporary directory
for the "dir-diff" feature forgot that symbolic links need not be
copied (or symlinked) to the temporary area, as the code already
special cases and overwrites them.  Besides, it was wrong to try
computing the object name of the target of symbolic link, which may
not even exist or may be a directory.

* da/difftool:
  difftool: ignore symbolic links in use_wt_file
---

aa0b4c31d9f21b806253ac16e59de82e2a5ec00e