[PATCH 1/4] Fix tree-walking compare_entry() in the presense of --prefix
- From
Linus Torvalds <torvalds@linux-foundation.org>
- Date
- Mar 6, 2008, 23:44 UTC
- Message-ID
- <76edcf443909a95e2c391e23390a963f9a417dee.1204856187.git.torvalds@linux-foundation.org>
- In-Reply-To
- <cover.1204856187.git.torvalds@linux-foundation.org>
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> --- tree-walk.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/tree-walk.c b/tree-walk.c index 842cb6a..02e2aed 100644 --- 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); + static struct traverse_info dummy; 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); + if (pathlen) + info->prev = &dummy; } char *make_traverse_path(char *path, const struct traverse_info *info, const struct name_entry *n)
-- 1.5.4.3.452.g67136