summaryrefslogtreecommitdiff
path: root/Documentation/git-checkout-index.txt
diff options
context:
space:
mode:
authorLibravatar David Aguilar <davvid@gmail.com>2016-05-16 11:05:37 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-05-16 14:53:05 -0700
commit366f9cea18fbb7ebb0a75735da8c2a9d5a916809 (patch)
tree6f9e09c510489c4172077e939a79be99f6470247 /Documentation/git-checkout-index.txt
parentdifftool: initialize variables for readability (diff)
downloadtgif-366f9cea18fbb7ebb0a75735da8c2a9d5a916809.tar.xz
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 'Documentation/git-checkout-index.txt')
0 files changed, 0 insertions, 0 deletions