| commit | 366f9cea18fbb7ebb0a75735da8c2a9d5a916809 | |
| author | David Aguilar <davvid@gmail.com> | |
| Mon, 16 May 2016 18:05:37 +0000 (16 11:05 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 16 May 2016 21:53:05 +0000 (16 14:53 -0700) | ||
| tree | 6f9e09c510489c4172077e939a79be99f6470247 | treesnapshot (tar.gz zip) |
| parent | 951b551d0f349f145f8606b946d64fc452ad6a51 | commitdiff |
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>
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>
| git-difftool.perl | diffblobblamehistory | |
| t/t7800-difftool.sh | diffblobblamehistory |