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

torvalds · gitster · commit bcbe5a515e83 · 2008-03-09T00:43:47.000-08:00
When we make the "root" tree-walk info entry have a pathname in it, we
need to have a -&gt;prev pointer so that compare_entry will actually notice
and traverse into the root.

Signed-off-by: Linus Torvalds &lt;torvalds@linux-foundation.org&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/tree-walk.c b/tree-walk.c
@@ -107,13 +107,16 @@ 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);
+	static struct traverse_info dummy;
 
 	memset(info, 0, sizeof(*info));
 	if (pathlen && base[pathlen-1] == '/')
 		pathlen--;
 	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)
