diff options
author | Elijah Newren <newren@gmail.com> | 2011-08-12 05:19:57 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-08-14 21:19:35 (GMT) |
commit | f2507b4e0ef0b7fc8c1e75004e8a86a0430dc512 (patch) | |
tree | 8d5f55c41b8425d24eee9138517bd219bbb5bf53 /fsck.h | |
parent | f0fd4d05e8a17fe5ccdd4d3edd686bc6702b8144 (diff) | |
download | git-f2507b4e0ef0b7fc8c1e75004e8a86a0430dc512.zip git-f2507b4e0ef0b7fc8c1e75004e8a86a0430dc512.tar.gz git-f2507b4e0ef0b7fc8c1e75004e8a86a0430dc512.tar.bz2 |
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>
Diffstat (limited to 'fsck.h')
0 files changed, 0 insertions, 0 deletions