Merge branch 'master' of git://repo.or.cz/git/fastimport

[git.git] / unpack-trees.c

diff --git a/unpack-trees.c b/unpack-trees.c
index cac2411b9de7b4889abe6b0b84df25d24a38c7e5..89dd279f89c7648ec333c59634b3169251eec7ab 100644 (file)
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -495,6 +495,9 @@ static void verify_absent(const char *path, const char *action,
        if (o->index_only || o->reset || !o->update)
                return;
 
+       if (has_symlink_leading_path(path, NULL))
+               return;
+
        if (!lstat(path, &st)) {
                int cnt;