Merge branch 'en/removing-untracked-fixes'

[thirdparty/git.git] / unpack-trees.c

diff --git a/unpack-trees.c b/unpack-trees.c
index 48ca93a7250807133ece63cb839f4ac97b55cfe4..a7e1712d2368a42ffb65e64778a322c2e5c18842 100644 (file)
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -1255,7 +1255,7 @@ static int sparse_dir_matches_path(const struct cache_entry *ce,
 static struct cache_entry *find_cache_entry(struct traverse_info *info,
                                            const struct name_entry *p)
 {
-       struct cache_entry *ce;
+       const char *path;
        int pos = find_cache_pos(info, p->path, p->pathlen);
        struct unpack_trees_options *o = info->data;
 
@@ -1281,9 +1281,11 @@ static struct cache_entry *find_cache_entry(struct traverse_info *info,
         * paths (e.g. "subdir-").
         */
        while (pos >= 0) {
-               ce = o->src_index->cache[pos];
+               struct cache_entry *ce = o->src_index->cache[pos];
 
-               if (strncmp(ce->name, p->path, p->pathlen))
+               if (!skip_prefix(ce->name, info->traverse_path, &path) ||
+                   strncmp(path, p->path, p->pathlen) ||
+                   path[p->pathlen] != '/')
                        return NULL;
 
                if (S_ISSPARSEDIR(ce->ce_mode) &&