diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-06-27 14:38:22 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-27 14:38:23 -0700 |
| commit | 88f90f8286e9e456ea332e00f87ad39892103544 (patch) | |
| tree | adc94f5e7e6fa961ccfffb7197fc0df0b664e3a4 /git-difftool.perl | |
| parent | 6be17ec5828386c3ae17af26fac66f65f1c817ec (diff) | |
| parent | 32eaf1de7f79c4ba09f3de3261c84e52e0a67af5 (diff) | |
| download | git-88f90f8286e9e456ea332e00f87ad39892103544.tar.gz git-88f90f8286e9e456ea332e00f87ad39892103544.tar.xz | |
Merge branch 'ks/difftool-dir-diff-copy-fix' into maint
* ks/difftool-dir-diff-copy-fix:
difftool --dir-diff: allow changing any clean working tree file
Diffstat (limited to 'git-difftool.perl')
| -rwxr-xr-x | git-difftool.perl | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/git-difftool.perl b/git-difftool.perl index 8a7520553..e57d3d129 100755 --- a/git-difftool.perl +++ b/git-difftool.perl @@ -85,13 +85,9 @@ sub exit_cleanup sub use_wt_file { - my ($repo, $workdir, $file, $sha1, $symlinks) = @_; + my ($repo, $workdir, $file, $sha1) = @_; my $null_sha1 = '0' x 40; - if ($sha1 ne $null_sha1 and not $symlinks) { - return 0; - } - if (! -e "$workdir/$file") { # If the file doesn't exist in the working tree, we cannot # use it. @@ -213,8 +209,7 @@ EOF if ($rmode ne $null_mode) { my ($use, $wt_sha1) = use_wt_file($repo, $workdir, - $dst_path, $rsha1, - $symlinks); + $dst_path, $rsha1); if ($use) { push @working_tree, $dst_path; $wtindex .= "$rmode $wt_sha1\t$dst_path\0"; |