Re: [PATCH 2/3] t7800: fix tests when difftool uses --no-symlinks

2013-03-22 Thread David Aguilar
On Fri, Mar 22, 2013 at 4:05 PM, John Keeping wrote: > On Fri, Mar 22, 2013 at 03:53:38PM -0700, Junio C Hamano wrote: >> John Keeping writes: >> >> > When 'git difftool --dir-diff' is using --no-symlinks (either explicitly >> > or implicitly because it's running on Windows), any working tree fil

Re: [PATCH 2/3] t7800: fix tests when difftool uses --no-symlinks

2013-03-22 Thread John Keeping
On Fri, Mar 22, 2013 at 03:53:38PM -0700, Junio C Hamano wrote: > John Keeping writes: > > > 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

Re: [PATCH 2/3] t7800: fix tests when difftool uses --no-symlinks

2013-03-22 Thread Junio C Hamano
John Keeping writes: > 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. This includes untracked file

Re: [PATCH 2/3] t7800: fix tests when difftool uses --no-symlinks

2013-03-22 Thread Johannes Sixt
Am 22.03.2013 20:36, schrieb John Keeping: > 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. This inc

[PATCH 2/3] t7800: fix tests when difftool uses --no-symlinks

2013-03-22 Thread John Keeping
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. This includes untracked files in the working tree. During