merge-recursive: Fix code checking for D/F conflicts still being present
commitf2507b4e0ef0b7fc8c1e75004e8a86a0430dc512
authorElijah Newren <newren@gmail.com>
Fri, 12 Aug 2011 05:19:57 +0000 (11 23:19 -0600)
committerJunio C Hamano <gitster@pobox.com>
Sun, 14 Aug 2011 21:19:35 +0000 (14 14:19 -0700)
tree8d5f55c41b8425d24eee9138517bd219bbb5bf53
parentf0fd4d05e8a17fe5ccdd4d3edd686bc6702b8144
merge-recursive: Fix code checking for D/F conflicts still being present

Previously, we were using lstat() to determine if a directory was still
present after a merge (and thus in the way of adding a file).  We should
have been using lstat() only to determine if untracked directories were in
the way (and then only when necessary to check for untracked directories);
we should instead using the index to determine if there is a tracked
directory in the way.  Create a new function to do this and use it to
replace the existing checks for directories being in the way.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
merge-recursive.c