diff options
| -rw-r--r-- | Documentation/technical/api-tree-walking.txt | 4 | ||||
| -rw-r--r-- | builtin/merge-tree.c | 2 | ||||
| -rw-r--r-- | tree-walk.c | 4 |
3 files changed, 3 insertions, 7 deletions
diff --git a/Documentation/technical/api-tree-walking.txt b/Documentation/technical/api-tree-walking.txt index bde18622a8..59d78e0362 100644 --- a/Documentation/technical/api-tree-walking.txt +++ b/Documentation/technical/api-tree-walking.txt @@ -62,9 +62,7 @@ Initializing `setup_traverse_info`:: Initialize a `traverse_info` given the pathname of the tree to start - traversing from. The `base` argument is assumed to be the `path` - member of the `name_entry` being recursed into unless the tree is a - top-level tree in which case the empty string ("") is used. + traversing from. Walking ------- diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c index 34ca0258b1..8ac6270836 100644 --- a/builtin/merge-tree.c +++ b/builtin/merge-tree.c @@ -180,7 +180,7 @@ static struct merge_list *create_entry(unsigned stage, unsigned mode, const stru static char *traverse_path(const struct traverse_info *info, const struct name_entry *n) { - char *path = xmallocz(traverse_path_len(info, n) + the_hash_algo->rawsz); + char *path = xmallocz(traverse_path_len(info, n)); return make_traverse_path(path, info, n); } diff --git a/tree-walk.c b/tree-walk.c index ec32a47b2e..ba106152ef 100644 --- a/tree-walk.c +++ b/tree-walk.c @@ -177,10 +177,8 @@ void setup_traverse_info(struct traverse_info *info, const char *base) info->pathlen = pathlen ? pathlen + 1 : 0; info->name.path = base; info->name.pathlen = pathlen; - if (pathlen) { - hashcpy(info->name.oid.hash, (const unsigned char *)base + pathlen + 1); + if (pathlen) info->prev = &dummy; - } } char *make_traverse_path(char *path, const struct traverse_info *info, const struct name_entry *n) |