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>
John Keeping committed
May 17, 2013 at 19:26 UTC
1f197a1de497db8898c9920fab77533dab34a03c
2 files changed
+13
git-difftool.perl
+6
@@ -92,6 +92,12 @@ sub use_wt_file
92
return 0;
93
}
94
95
+ if (! -e "$workdir/$file") {
96
+ # If the file doesn't exist in the working tree, we cannot
97
+ # use it.
98
+ return (0, $null_sha1);
99
+ }
100
+
101
my $wt_sha1 = $repo->command_oneline('hash-object', "$workdir/$file");
102
my $use = ($sha1 eq $null_sha1) || ($sha1 eq $wt_sha1);
103
return ($use, $wt_sha1);
t/t7800-difftool.sh
+7
@@ -356,6 +356,13 @@ run_dir_diff_test 'difftool --dir-diff from subdirectory' '
356
)
357
'
358
359
+run_dir_diff_test 'difftool --dir-diff when worktree file is missing' '
360
+ test_when_finished git reset --hard &&
361
+ rm file2 &&
362
+ git difftool --dir-diff $symlinks --extcmd ls branch master >output &&
363
+ grep file2 output
364
+'
365
+
366
write_script .git/CHECK_SYMLINKS <<\EOF
367
for f in file file2 sub/sub
368
do