mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/difftool-dir-diff-edit-fix'

Browse Source 
"git difftool --dir-diff" made symlinks to working tree files when
preparing a temporary directory structure, so that accidental edits
of these files in the difftool are reflected back to the working
tree, but the logic to decide when to do so was not quite right.

* jk/difftool-dir-diff-edit-fix:
  difftool --dir-diff: symlink all files matching the working tree
  difftool: avoid double slashes in symlink targets
  git-difftool(1): fix formatting of --symlink description
This commit is contained in:
Junio C Hamano
2013-03-28 14:37:22 -07:00
parent d8355e5eae 02c56314aa
commit 18973d8ac9
3 changed files with 48 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
git-difftool.perl
View File

@ -83,6 +83,21 @@ sub exit_cleanup
exit($status | ($status >> 8));
}
sub use_wt_file
{
my ($repo, $workdir, $file, $sha1, $symlinks) = @_;
my $null_sha1 = '0' x 40;
if ($sha1 eq $null_sha1) {
return 1;
} elsif (not $symlinks) {
return 0;
}
my $wt_sha1 = $repo->command_oneline('hash-object', "$workdir/$file");
return $sha1 eq $wt_sha1;
}
sub setup_dir_diff
{
my ($repo, $workdir, $symlinks) = @_;
@ -159,10 +174,10 @@ EOF
}
if ($rmode ne $null_mode) {
if ($rsha1 ne $null_sha1) {
$rindex .= "$rmode $rsha1\t$dst_path\0";
} else {
if (use_wt_file($repo, $workdir, $dst_path, $rsha1, $symlinks)) {
push(@working_tree, $dst_path);
} else {
$rindex .= "$rmode $rsha1\t$dst_path\0";
}
}
}
@ -209,7 +224,9 @@ EOF
delete($ENV{GIT_INDEX_FILE});
# Changes in the working tree need special treatment since they are
# not part of the index
# not part of the index. Remove any trailing slash from $workdir
# before starting to avoid double slashes in symlink targets.
$workdir =~ s|/$||;
for my $file (@working_tree) {
my $dir = dirname($file);
unless (-d "$rdir/$dir") {