summaryrefslogtreecommitdiff
path: root/gitk-git/gitk
diff options
context:
space:
mode:
authorLibravatar John Keeping <john@keeping.me.uk>2013-05-17 19:26:08 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-05-17 11:46:53 -0700
commit1f197a1de497db8898c9920fab77533dab34a03c (patch)
tree84de54dd5e8c42b3351e515ad6ec2b1702e2557d /gitk-git/gitk
parentremote-bzr: fixes for older versions of bzr (diff)
downloadtgif-1f197a1de497db8898c9920fab77533dab34a03c.tar.xz
difftool: fix dir-diff when file does not exist in working tree
Commit 02c5631 (difftool --dir-diff: symlink all files matching the working tree, 2013-03-14) does not handle the case where a file that is being compared does not exist in the working tree. Fix this by checking for existence explicitly before running git-hash-object. Reported-by: Kevin Bracey <kevin@bracey.fi> Signed-off-by: John Keeping <john@keeping.me.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'gitk-git/gitk')
0 files changed, 0 insertions, 0 deletions