diff options
| author | John Keeping <john@keeping.me.uk> | 2013-03-29 11:28:35 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-03-29 15:16:40 -0700 |
| commit | 3caf5a93d8ccbffaccfbae3fe814325682cc95f4 (patch) | |
| tree | 4a2244ae0df040cc0a8b010408ea1a1cf88cb46b | |
| parent | 472353a579b3c3fd645ea4f0aac582317e488775 (diff) | |
| download | git-3caf5a93d8ccbffaccfbae3fe814325682cc95f4.tar.gz | |
t7800: fix tests when difftool uses --no-symlinks
When 'git difftool --dir-diff' is using --no-symlinks (either explicitly
or implicitly because it's running on Windows), any working tree files
that have been copied to the temporary directory are copied back after
the difftool completes.
Because an earlier test uses "git add .", the "output" file used by
tests is tracked by Git and the following sequence occurs during some
tests:
1) the shell opens "output" to redirect the difftool output
2) difftool copies the empty "output" to the temporary directory
3) difftool runs "ls" which writes to "output"
4) difftool copies the empty "output" file back over the output of the
command
5) the output file doesn't contain the expected output, causing the
test to fail
Instead of adding all changes, explicitly add only the files that the
test is using, allowing later tests to write their result files into the
working tree.
Signed-off-by: John Keeping <john@keeping.me.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t7800-difftool.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh index 9fd09dbe93..df443a981d 100755 --- a/t/t7800-difftool.sh +++ b/t/t7800-difftool.sh @@ -314,7 +314,7 @@ test_expect_success PERL 'setup change in subdirectory' ' git commit -m "added sub/sub" && echo test >>file && echo test >>sub/sub && - git add . && + git add file sub/sub && git commit -m "modified both" ' |