summaryrefslogtreecommitdiff
path: root/git-gui/lib/commit.tcl
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-11-03 15:13:01 -0800
committerJunio C Hamano <gitster@pobox.com>2015-11-03 15:13:02 -0800
commitc253b82e42d8e6673917efb431479f8a9165de76 (patch)
treefe52d891f207817b92a0893b1fbb57a9dc541567 /git-gui/lib/commit.tcl
parentc5d9418ecdffe6e71a83ba1a5940d2cf2bf4f7e3 (diff)
parentcfe2d4be9126f03d8ca198f9da36762cdf59b52f (diff)
Merge branch 'da/difftool'
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
Diffstat (limited to 'git-gui/lib/commit.tcl')
0 files changed, 0 insertions, 0 deletions