diff options
| author | Matheus Tavares <matheus.bernardino@usp.br> | 2021-05-04 13:27:28 -0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-05-05 12:25:25 +0900 |
| commit | 96168827802b08c4adf2a036594ab235b2c5630f (patch) | |
| tree | b1d6fc3ba702f01f3747a0beea7a6e4adc8a6d1e /builtin/difftool.c | |
| parent | 68e66f2987724a639c896e7996ea347be62ef578 (diff) | |
| download | git-96168827802b08c4adf2a036594ab235b2c5630f.tar.gz | |
make_transient_cache_entry(): optionally alloc from mem_pool
Allow make_transient_cache_entry() to optionally receive a mem_pool
struct in which it should allocate the entry. This will be used in the
following patch, to store some transient entries which should persist
until parallel checkout finishes.
Signed-off-by: Matheus Tavares <matheus.bernardino@usp.br>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 ef25729d49..afacbcd581 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); |