@matheusbsbs / matheus-bagliano / commits / e4837b4406
Fork 0

t7800: don't rely on reuse_worktree_file()

A test in t7800 tries to make sure that when git-difftool runs an external tool that fails, it stops looking at files. Our fake failing tool prints the file name it was asked to diff before exiting non-zero, and then we confirm the output contains only that file. However, this subtly relies on our internal reuse_worktree_file(). Because we're diffing between branches, the command run by difftool might see: - the git-stored filename (e.g., "file"), if we decided that the working tree contents were up-to-date with the object in the index and HEAD, and we could reuse them - a temporary filename (e.g. "/tmp/abc123_file") if we had to dump the contents from the object database If the latter case happens, then the test fails, because it's expecting the string "file". I discovered this when debugging something unrelated with reuse_worktree_file(). I _thought_ it should be able to be triggered by a racy-git situation, but running: ./t7800-difftool.sh --stress --run=2,13 never seems to fail. However, by my reading of reuse_worktree_file(), this would probably always fail under Cygwin, because it sets NO_FAST_WORKING_DIRECTORY. At any rate, since reuse_worktree_file() is meant to be an optimization that may or may not trigger, our test should be robust either way. Instead of checking the filename, let's just make sure we got a single line of output (which would not be true if we continued after the first failure). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jeff King committed Jan 16, 2020 at 13:19 UTC e4837b4406ae7a7192e22359dc94d69b8a8ef69d
1 file changed +2 -3
t/t7800-difftool.sh
+2 -3
@@ -125,15 +125,14 @@ test_expect_success 'difftool stops on error with --trust-exit-code' '
125 test_when_finished "rm -f for-diff .git/fail-right-file" &&
126 test_when_finished "git reset -- for-diff" &&
127 write_script .git/fail-right-file <<-\EOF &&
128 - echo "$2"
128 + echo failed
129 exit 1
130 EOF
131 >for-diff &&
132 git add for-diff &&
133 - echo file >expect &&
133 test_must_fail git difftool -y --trust-exit-code \
134 --extcmd .git/fail-right-file branch >actual &&
136 - test_cmp expect actual
135 + test_line_count = 1 actual
136 '
137
138 test_expect_success 'difftool honors exit status if command not found' '