From: Tim Henigan tim.heni...@gmail.com
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
copied from the tmp dir back to the working copy if they were
actually modified.
Signed-off-by: Tim Henigan tim.heni...@gmail.com
Signed-off-by: David Aguilar dav...@gmail.com
---
Perhaps something like this...
git-difftool.perl | 7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/git-difftool.perl b/git-difftool.perl
index ae1e052..c079854 100755
--- a/git-difftool.perl
+++ b/git-difftool.perl
@@ -15,6 +15,7 @@ use strict;
use warnings;
use File::Basename qw(dirname);
use File::Copy;
+use File::Compare;
use File::Find;
use File::stat;
use File::Path qw(mkpath);
@@ -336,8 +337,10 @@ if (defined($dirdiff)) {
# files were modified during the diff, then the changes
# should be copied back to the working tree
for my $file (@working_tree) {
- copy($b/$file, $workdir/$file) or die $!;
- chmod(stat($b/$file)-mode, $workdir/$file) or die $!;
+ if (-e $b/$file compare($b/$file, $workdir/$file)) {
+ copy($b/$file, $workdir/$file) or die $!;
+ chmod(stat($b/$file)-mode, $workdir/$file) or die
$!;
+ }
}
} else {
if (defined($prompt)) {
--
1.7.11.2.250.g00b4b9a
--
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
