[PATCH] difftool: fix dir-diff when file does not exist in working tree
From: John Keeping <hidden>
Date: 2016-06-15 22:57:18
Subsystem:
the rest · Maintainer:
Linus Torvalds
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 <redacted> Signed-off-by: John Keeping <redacted> --- This fixes a regression in 1.8.3-rc0. git-difftool.perl | 9 ++++++++- t/t7800-difftool.sh | 7 +++++++ 2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/git-difftool.perl b/git-difftool.perl
index 6780292..0a1cb0a 100755
--- a/git-difftool.perl
+++ b/git-difftool.perl@@ -92,7 +92,14 @@ sub use_wt_file return 0; } - my $wt_sha1 = $repo->command_oneline('hash-object', "$workdir/$file"); + my $wt_sha1; + if (-e "$workdir/$file") { + $wt_sha1 = $repo->command_oneline('hash-object', "$workdir/$file"); + } else { + # If the file doesn't exist in the working tree, use something + # that cannot match a SHA-1. + $wt_sha1 = ''; + }; my $use = ($sha1 eq $null_sha1) || ($sha1 eq $wt_sha1); return ($use, $wt_sha1); }
diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh
index a6bd99e..d46f041 100755
--- a/t/t7800-difftool.sh
+++ b/t/t7800-difftool.sh@@ -356,6 +356,13 @@ run_dir_diff_test 'difftool --dir-diff from subdirectory' ' ) ' +run_dir_diff_test 'difftool --dir-diff when worktree file is missing' ' + test_when_finished git reset --hard && + rm file2 && + git difftool --dir-diff $symlinks --extcmd ls branch master >output && + grep file2 output +' + write_script .git/CHECK_SYMLINKS <<\EOF for f in file file2 sub/sub do
--
1.8.3.rc2.285.gfc18c2c