Merge branch 'cc/multi-promisor'

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

diff --git a/merge-recursive.c b/merge-recursive.c
index 6b812d67e3ecd54ece21c2465ede3e28d6fba325..22a12cfeba381d184db376301ac7b19d66f80e85 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -764,7 +764,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));
 }
 
 /*