Merge branch 'en/merge-recursive-cleanup'

[thirdparty/git.git] / merge-recursive.c

diff --git a/merge-recursive.c b/merge-recursive.c
index 2653ba9a50c5d3c727e95ade81fcace7aba1d79a..e86571c91be9e82ae9b88371db4c706103e88785 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -776,7 +776,8 @@ static int dir_in_way(struct index_state *istate, const char *path,
 
        strbuf_release(&dirpath);
        return check_working_copy && !lstat(path, &st) && S_ISDIR(st.st_mode) &&
-               !(empty_ok && is_empty_dir(path));
+               !(empty_ok && is_empty_dir(path)) &&
+               !has_symlink_leading_path(path, strlen(path));
 }
 
 /*