X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=merge-recursive.c;h=22a12cfeba381d184db376301ac7b19d66f80e85;hb=59b19bcd9ff8193c3197fb9e2f18ce85e4f86335;hp=6b812d67e3ecd54ece21c2465ede3e28d6fba325;hpb=f4f8dfe127918241c1e3448436d32a89f13fa5a8;p=thirdparty%2Fgit.git

diff --git a/merge-recursive.c b/merge-recursive.c
index 6b812d67e3..22a12cfeba 100644
--- 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));
 }
 
 /*