diff options
Diffstat (limited to 'builtin/merge-tree.c')
-rw-r--r-- | builtin/merge-tree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c index 8ac6270836..f0e4cfefaa 100644 --- a/builtin/merge-tree.c +++ b/builtin/merge-tree.c @@ -181,7 +181,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)); - return make_traverse_path(path, info, n); + return make_traverse_path(path, info, n->path, n->pathlen); } static void resolve(const struct traverse_info *info, struct name_entry *ours, struct name_entry *result) |