diff options
| author | DongHun Kwak <dh0128.kwak@samsung.com> | 2021-03-03 15:17:05 +0900 |
|---|---|---|
| committer | DongHun Kwak <dh0128.kwak@samsung.com> | 2021-03-03 15:17:05 +0900 |
| commit | d4e4db7b025e91cc6cd9ecc1e0bc54f54dd3e3ee (patch) | |
| tree | 1e1414f4d171e1923369fb79094d67eba24f9f48 /builtin/merge-tree.c | |
| parent | f6ae050ddb0b43971499f7bad5c1c55ffafd7386 (diff) | |
| download | git-d4e4db7b025e91cc6cd9ecc1e0bc54f54dd3e3ee.tar.gz git-d4e4db7b025e91cc6cd9ecc1e0bc54f54dd3e3ee.tar.bz2 git-d4e4db7b025e91cc6cd9ecc1e0bc54f54dd3e3ee.zip | |
Imported Upstream version 2.24.0upstream/2.24.0
Diffstat (limited to 'builtin/merge-tree.c')
| -rw-r--r-- | builtin/merge-tree.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c index 97b54cae..e72714a5 100644 --- a/builtin/merge-tree.c +++ b/builtin/merge-tree.c @@ -180,8 +180,9 @@ 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); - return make_traverse_path(path, info, n); + struct strbuf buf = STRBUF_INIT; + strbuf_make_traverse_path(&buf, info, n->path, n->pathlen); + return strbuf_detach(&buf, NULL); } static void resolve(const struct traverse_info *info, struct name_entry *ours, struct name_entry *result) |