diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-02-22 14:55:44 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-02-22 14:55:44 -0800 |
| commit | a42d69ee5beacd163229e5dd8c94be85431d6c85 (patch) | |
| tree | 28c01f0d8356e721b674305e7221761754e4cf97 | |
| parent | 24fb150dcd6b18b6d14ed14a02c6a17c33f0d443 (diff) | |
| parent | 93ea118bedf3f6d300520718250bf64d0e09a4ec (diff) | |
| download | git-a42d69ee5beacd163229e5dd8c94be85431d6c85.tar.gz | |
Merge branch 'rs/cache-tree-strbuf-growth-fix'
Remove unnecessary explicit sizing of strbuf.
* rs/cache-tree-strbuf-growth-fix:
cache-tree: fix strbuf growth in prime_cache_tree_rec()
| -rw-r--r-- | cache-tree.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/cache-tree.c b/cache-tree.c index 9af457f47c..88c2c04f87 100644 --- a/cache-tree.c +++ b/cache-tree.c @@ -760,7 +760,7 @@ static void prime_cache_tree_rec(struct repository *r, struct tree_desc desc; struct name_entry entry; int cnt; - int base_path_len = tree_path->len; + size_t base_path_len = tree_path->len; oidcpy(&it->oid, &tree->object.oid); @@ -785,7 +785,6 @@ static void prime_cache_tree_rec(struct repository *r, */ if (r->index->sparse_index) { strbuf_setlen(tree_path, base_path_len); - strbuf_grow(tree_path, base_path_len + entry.pathlen + 1); strbuf_add(tree_path, entry.path, entry.pathlen); strbuf_addch(tree_path, '/'); } |