diff options
| author | Derrick Stolee <dstolee@microsoft.com> | 2021-01-23 19:58:11 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-01-24 01:14:07 (GMT) |
| commit | fb0882648e0d624f825974aa7030e56daf6de2af (patch) | |
| tree | 3d026aafbb71ed1b7b402fc0037cdcebb2df6369 /cache-tree.c | |
| parent | a4b6d202caad83c6dc29abe9b17e53a1b3fb54a0 (diff) | |
| download | git-fb0882648e0d624f825974aa7030e56daf6de2af.zip git-fb0882648e0d624f825974aa7030e56daf6de2af.tar.gz git-fb0882648e0d624f825974aa7030e56daf6de2af.tar.bz2 | |
cache-tree: clean up cache_tree_update()
Make the method safer by allocating a cache_tree member for the given
index_state if it is not already present. This is preferrable to a
BUG() statement or returning with an error because future callers will
want to populate an empty cache-tree using this method.
Callers can also remove their conditional allocations of cache_tree.
Also drop local variables that can be found directly from the 'istate'
parameter.
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'cache-tree.c')
| -rw-r--r-- | cache-tree.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/cache-tree.c b/cache-tree.c index 3f1a8d4..60b6aef 100644 --- a/cache-tree.c +++ b/cache-tree.c @@ -436,16 +436,20 @@ static int update_one(struct cache_tree *it, int cache_tree_update(struct index_state *istate, int flags) { - struct cache_tree *it = istate->cache_tree; - struct cache_entry **cache = istate->cache; - int entries = istate->cache_nr; - int skip, i = verify_cache(cache, entries, flags); + int skip, i; + + i = verify_cache(istate->cache, istate->cache_nr, flags); if (i) return i; + + if (!istate->cache_tree) + istate->cache_tree = cache_tree(); + trace_performance_enter(); trace2_region_enter("cache_tree", "update", the_repository); - i = update_one(it, cache, entries, "", 0, &skip, flags); + i = update_one(istate->cache_tree, istate->cache, istate->cache_nr, + "", 0, &skip, flags); trace2_region_leave("cache_tree", "update", the_repository); trace_performance_leave("cache_tree_update"); if (i < 0) @@ -635,9 +639,6 @@ static int write_index_as_tree_internal(struct object_id *oid, cache_tree_valid = 0; } - if (!index_state->cache_tree) - index_state->cache_tree = cache_tree(); - if (!cache_tree_valid && cache_tree_update(index_state, flags) < 0) return WRITE_TREE_UNMERGED_INDEX; |