[PATCH v2 2/3] 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 files 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.

In the longer term, difftool probably needs to learn to warn the user instead of overwrite any changes that have been made to the working tree file.

Signed-off-by: John Keeping <john@keeping.me.uk>

---
Changes since v1:
- Fix the actual cause of the issue in the test instead of masking it by
  moving the output file under .git/

 t/t7800-difftool.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)