diff options
| author | David Aguilar <davvid@gmail.com> | 2016-05-16 18:05:37 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-05-16 21:53:05 (GMT) |
| commit | 366f9cea18fbb7ebb0a75735da8c2a9d5a916809 (patch) | |
| tree | 6f9e09c510489c4172077e939a79be99f6470247 /git-difftool.perl | |
| parent | 951b551d0f349f145f8606b946d64fc452ad6a51 (diff) | |
| download | git-366f9cea18fbb7ebb0a75735da8c2a9d5a916809.zip git-366f9cea18fbb7ebb0a75735da8c2a9d5a916809.tar.gz git-366f9cea18fbb7ebb0a75735da8c2a9d5a916809.tar.bz2 | |
difftool: handle unmerged files in dir-diff mode
When files are unmerged they can show up as both unmerged and
modified in the output of `git diff --raw`. This causes
difftool's dir-diff to create filesystem entries for the same
path twice, which fails when it encounters a duplicate path.
Ensure that each worktree path is only processed once.
Add a test to demonstrate the breakage.
Reported-by: Jan Smets <jan@smets.cx>
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-difftool.perl')
| -rwxr-xr-x | git-difftool.perl | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/git-difftool.perl b/git-difftool.perl index 8cf0040..ebd13ba 100755 --- a/git-difftool.perl +++ b/git-difftool.perl @@ -138,6 +138,7 @@ sub setup_dir_diff my %submodule; my %symlink; my @working_tree = (); + my %working_tree_dups = (); my @rawdiff = split('\0', $diffrtn); my $i = 0; @@ -188,6 +189,10 @@ EOF } if ($rmode ne $null_mode) { + # Avoid duplicate working_tree entries + if ($working_tree_dups{$dst_path}++) { + next; + } my ($use, $wt_sha1) = use_wt_file($repo, $workdir, $dst_path, $rsha1); if ($use) { |