Re: [PATCH v2 2/3] t7800: fix tests when difftool uses --no-symlinks
On Sat, Mar 23, 2013 at 9:31 AM, John Keeping <john@keeping.me.uk> wrote:
Show 6 quoted lines
> 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
s/files doesn't/file doesn't/
Show 8 quoted lines
> 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>
Eric Sunshine <sunshine@sunshineco.com>