Re: [PATCH v2] difftool: only copy back files modified during directory diff

2012-07-20 Thread David Aguilar
On Thu, Jul 19, 2012 at 10:34 AM, Junio C Hamano wrote: > David Aguilar writes: > >> Perhaps something like this... > > Yeah, like that ;-). Hmm.. this one was potentially data-losing. Sorry for not catching that in 7e0abcec103b3649943b236881cf88e8fd6cf3a4. $ git tag --contains 7e0abcec103b364

Re: [PATCH v2] difftool: only copy back files modified during directory diff

2012-07-19 Thread Junio C Hamano
David Aguilar writes: > Perhaps something like this... Yeah, like that ;-). -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

[PATCH v2] difftool: only copy back files modified during directory diff

2012-07-19 Thread David Aguilar
From: Tim Henigan When 'difftool --dir-diff' is used to compare working tree files, it always copies files from the tmp dir back to the working tree when the diff tool is closed, even if the files were not modified by the diff tool. This causes the file timestamp to change. Files should only be