Tim HeniganIf the user runs a diff when there are modified files in the working copy, they expect to be able to be edit the files in the diff viewer and save the changes. When using difftool in file mode (i.e. diffing one file at a time), this works as expected. However, when using difftool in directory diff mode, the changes are not saved.
This commit teaches the directory diff mode to copy changes from the diff viewer back to the working copy.
Signed-off-by: Tim Henigan <tim.henigan@gmail.com> --- git-difftool.perl | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
Show changes to git-difftool.perl +10 −2
diff --git a/git-difftool.perl b/git-difftool.perl index 0262c7a..ebffd1e 100755 --- a/git-difftool.perl +++ b/git-difftool.perl @@ -22,6 +22,8 @@ use File::Temp qw(tempdir); use Getopt::Long qw(:config pass_through); use Git; +my @working_tree; + sub usage { my $exitcode = shift; @@ -54,7 +56,6 @@ sub setup_dir_diff my $null_sha1 = 0 x 40; my $lindex = ""; my $rindex = ""; - my @working_tree; my %submodule; my @rawdiff = split('\0', $diffrtn); @@ -176,9 +177,16 @@ if (defined($dirdiff)) { $ENV{GIT_DIFFTOOL_DIRDIFF} = 'true'; system("git difftool--helper $a $b"); } - # TODO: if the diff including working copy files and those + + # If the diff including working copy files and those # files were modified during the diff, then the changes # should be copied back to the working tree + my $repo = Git->repository(); + my $workdir = $repo->wc_path(); + for (@working_tree) { + copy("$b/$_", "$workdir/$_") or die $!; + chmod(stat("$b/$_")->mode, "$workdir/$_") or die $!; + } } else { if (defined($prompt)) { $ENV{GIT_DIFFTOOL_PROMPT} = 'true';
-- 1.7.9.1.290.gbd444