diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-08-03 00:30:43 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-03 00:30:43 +0200 |
| commit | ae533c4a92aef6ab180441dbb76ef83521fc87d6 (patch) | |
| tree | 0e722c62f6fb4a7d053bdb9bcb37115d8946336b /builtin/reset.c | |
| parent | Merge branch 'jt/fetch-nego-tip' (diff) | |
| parent | block alloc: add validations around cache_entry lifecyle (diff) | |
| download | git-ae533c4a92aef6ab180441dbb76ef83521fc87d6.tar.xz git-ae533c4a92aef6ab180441dbb76ef83521fc87d6.zip | |
Merge branch 'jm/cache-entry-from-mem-pool'
For a large tree, the index needs to hold many cache entries
allocated on heap. These cache entries are now allocated out of a
dedicated memory pool to amortize malloc(3) overhead.
* jm/cache-entry-from-mem-pool:
block alloc: add validations around cache_entry lifecyle
block alloc: allocate cache entries from mem_pool
mem-pool: fill out functionality
mem-pool: add life cycle management functions
mem-pool: only search head block for available space
block alloc: add lifecycle APIs for cache_entry structs
read-cache: teach make_cache_entry to take object_id
read-cache: teach refresh_cache_entry to take istate
Diffstat (limited to 'builtin/reset.c')
| -rw-r--r-- | builtin/reset.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/reset.c b/builtin/reset.c index d9871e5b6c..11cd0dcb8c 100644 --- a/builtin/reset.c +++ b/builtin/reset.c @@ -134,7 +134,7 @@ static void update_index_from_diff(struct diff_queue_struct *q, continue; } - ce = make_cache_entry(one->mode, one->oid.hash, one->path, + ce = make_cache_entry(&the_index, one->mode, &one->oid, one->path, 0, 0); if (!ce) die(_("make_cache_entry failed for path '%s'"), |