diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-05-16 12:05:23 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-05-16 12:05:23 (GMT) |
| commit | a737e1f1d25747481bd4925555006f569e461117 (patch) | |
| tree | f7f7cb6a78b9e67f9eb6e9c35cdc85758c0ebd25 /unpack-trees.c | |
| parent | 644f4a20468da89c1325a539c0521336f7835a64 (diff) | |
| parent | 87094fc2daa9613c2fad454dbb068a8f23ce8de8 (diff) | |
| download | git-a737e1f1d25747481bd4925555006f569e461117.zip git-a737e1f1d25747481bd4925555006f569e461117.tar.gz git-a737e1f1d25747481bd4925555006f569e461117.tar.bz2 | |
Merge branch 'mt/parallel-checkout-part-3'
The final part of "parallel checkout".
* mt/parallel-checkout-part-3:
ci: run test round with parallel-checkout enabled
parallel-checkout: add tests related to .gitattributes
t0028: extract encoding helpers to lib-encoding.sh
parallel-checkout: add tests related to path collisions
parallel-checkout: add tests for basic operations
checkout-index: add parallel checkout support
builtin/checkout.c: complete parallel checkout support
make_transient_cache_entry(): optionally alloc from mem_pool
Diffstat (limited to 'unpack-trees.c')
| -rw-r--r-- | unpack-trees.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/unpack-trees.c b/unpack-trees.c index 7a1804c..f88a69f 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -1038,7 +1038,7 @@ static struct cache_entry *create_ce_entry(const struct traverse_info *info, size_t len = traverse_path_len(info, tree_entry_len(n)); struct cache_entry *ce = is_transient ? - make_empty_transient_cache_entry(len) : + make_empty_transient_cache_entry(len, NULL) : make_empty_cache_entry(istate, len); ce->ce_mode = create_ce_mode(n->mode); |