diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-05-16 21:05:23 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-05-16 21:05:23 +0900 |
| commit | a737e1f1d25747481bd4925555006f569e461117 (patch) | |
| tree | f7f7cb6a78b9e67f9eb6e9c35cdc85758c0ebd25 /builtin/difftool.c | |
| parent | 644f4a20468da89c1325a539c0521336f7835a64 (diff) | |
| parent | 87094fc2daa9613c2fad454dbb068a8f23ce8de8 (diff) | |
| download | git-a737e1f1d25747481bd4925555006f569e461117.tar.gz | |
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 'builtin/difftool.c')
| -rw-r--r-- | builtin/difftool.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/difftool.c b/builtin/difftool.c index 0202a43052..89334b77fb 100644 --- a/builtin/difftool.c +++ b/builtin/difftool.c @@ -323,7 +323,7 @@ static int checkout_path(unsigned mode, struct object_id *oid, struct cache_entry *ce; int ret; - ce = make_transient_cache_entry(mode, oid, path, 0); + ce = make_transient_cache_entry(mode, oid, path, 0, NULL); ret = checkout_entry(ce, state, NULL, NULL); discard_cache_entry(ce); |