Re: [PATCH v2] difftool --dir-diff: always use identical working tree file

2013-05-28 Thread Junio C Hamano
John Keeping writes: >> - When comparing two revisions, e.g. "--dir-diff HEAD^^ HEAD^", >>that checks out (via $rsha1 to "checkout -f" codepath) a blob >>that does not match what is in the working tree of HEAD to the >>temporary directory, we still allow modifications to the copy in

Re: [PATCH v2] difftool --dir-diff: always use identical working tree file

2013-05-28 Thread John Keeping
On Tue, May 28, 2013 at 11:57:08AM -0700, Junio C Hamano wrote: > John Keeping writes: > > > Yeah, the commit message is still quite focused on the end effect of > > copying files back. But that's not what's being changed here. > > > > In my suggested commit message I tried to make it clear that

Re: [PATCH v2] difftool --dir-diff: always use identical working tree file

2013-05-28 Thread Junio C Hamano
John Keeping writes: > Yeah, the commit message is still quite focused on the end effect of > copying files back. But that's not what's being changed here. > > In my suggested commit message I tried to make it clear that we're > changing when we decide to copy a file across to the temporary tree

Re: [PATCH v2] difftool --dir-diff: always use identical working tree file

2013-05-28 Thread John Keeping
On Tue, May 28, 2013 at 11:06:13AM -0700, Junio C Hamano wrote: > Kenichi Saita writes: > > > When deciding whether or not we should link a working tree file into > > the temporary right-hand directory for a directory diff, we > > currently behave differently in the --symlink and --no-symlink > >

Re: [PATCH v2] difftool --dir-diff: always use identical working tree file

2013-05-28 Thread Junio C Hamano
Kenichi Saita writes: > When deciding whether or not we should link a working tree file into > the temporary right-hand directory for a directory diff, we > currently behave differently in the --symlink and --no-symlink > cases. If using symlinks any identical files are linked across but > with

[PATCH v2] difftool --dir-diff: always use identical working tree file

2013-05-27 Thread Kenichi Saita
When deciding whether or not we should link a working tree file into the temporary right-hand directory for a directory diff, we currently behave differently in the --symlink and --no-symlink cases. If using symlinks any identical files are linked across but with --no-symlink only files that conta