Fix tree-walking compare_entry() in the presense of --prefix

When we make the "root" tree-walk info entry have a pathname in it, we
need to have a ->prev pointer so that compare_entry will actually notice
and traverse into the root.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/tree-walk.c b/tree-walk.c
index 842cb6ad2e4086610cb4f268be14ec0cddf2ee4e..02e2aed7737207225f1b96eed774a1b75dd6d8d9 100644 (file)
--- a/tree-walk.c
+++ b/tree-walk.c
@@ -107,6 +107,7 @@ int tree_entry(struct tree_desc *desc, struct name_entry *entry)
 void setup_traverse_info(struct traverse_info *info, const char *base)
 {
        int pathlen = strlen(base);
 void setup_traverse_info(struct traverse_info *info, const char *base)
 {
        int pathlen = strlen(base);

+       static struct traverse_info dummy;

 
        memset(info, 0, sizeof(*info));
        if (pathlen && base[pathlen-1] == '/')
 
        memset(info, 0, sizeof(*info));
        if (pathlen && base[pathlen-1] == '/')


@@ -114,6 +115,8 @@ void setup_traverse_info(struct traverse_info *info, const char *base)
        info->pathlen = pathlen ? pathlen + 1 : 0;
        info->name.path = base;
        info->name.sha1 = (void *)(base + pathlen + 1);
        info->pathlen = pathlen ? pathlen + 1 : 0;
        info->name.path = base;
        info->name.sha1 = (void *)(base + pathlen + 1);

+       if (pathlen)
+               info->prev = &dummy;

 }
 
 char *make_traverse_path(char *path, const struct traverse_info *info, const struct name_entry *n)
 }
 
 char *make_traverse_path(char *path, const struct traverse_info *info, const struct name_entry *n)