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>
Derrick Stolee committed
Jan 23, 2021 at 19:58 UTC
fb0882648e0d624f825974aa7030e56daf6de2af
4 files changed
+9
-16
builtin/checkout.c
-3
@@ -821,9 +821,6 @@ static int merge_working_tree(const struct checkout_opts *opts,
821
}
822
}
823
824
- if (!active_cache_tree)
825
- active_cache_tree = cache_tree();
826
-
824
if (!cache_tree_fully_valid(active_cache_tree))
825
cache_tree_update(&the_index, WRITE_TREE_SILENT | WRITE_TREE_REPAIR);
826
cache-tree.c
+9
-8
@@ -436,16 +436,20 @@ static int update_one(struct cache_tree *it,
436
437
int cache_tree_update(struct index_state *istate, int flags)
438
{
439
- struct cache_tree *it = istate->cache_tree;
440
- struct cache_entry **cache = istate->cache;
441
- int entries = istate->cache_nr;
442
- int skip, i = verify_cache(cache, entries, flags);
439
+ int skip, i;
440
+
441
+ i = verify_cache(istate->cache, istate->cache_nr, flags);
442
443
if (i)
444
return i;
445
+
446
+ if (!istate->cache_tree)
447
+ istate->cache_tree = cache_tree();
448
+
449
trace_performance_enter();
450
trace2_region_enter("cache_tree", "update", the_repository);
448
- i = update_one(it, cache, entries, "", 0, &skip, flags);
451
+ i = update_one(istate->cache_tree, istate->cache, istate->cache_nr,
452
+ "", 0, &skip, flags);
453
trace2_region_leave("cache_tree", "update", the_repository);
454
trace_performance_leave("cache_tree_update");
455
if (i < 0)
@@ -635,9 +639,6 @@ static int write_index_as_tree_internal(struct object_id *oid,
639
cache_tree_valid = 0;
640
}
641
638
- if (!index_state->cache_tree)
639
- index_state->cache_tree = cache_tree();
640
-
642
if (!cache_tree_valid && cache_tree_update(index_state, flags) < 0)
643
return WRITE_TREE_UNMERGED_INDEX;
644
sequencer.c
-3
@@ -679,9 +679,6 @@ static int do_recursive_merge(struct repository *r,
679
680
static struct object_id *get_cache_tree_oid(struct index_state *istate)
681
{
682
- if (!istate->cache_tree)
683
- istate->cache_tree = cache_tree();
684
-
682
if (!cache_tree_fully_valid(istate->cache_tree))
683
if (cache_tree_update(istate, 0)) {
684
error(_("unable to update cache tree"));
unpack-trees.c
-2
@@ -1726,8 +1726,6 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options
1726
if (!ret) {
1727
if (git_env_bool("GIT_TEST_CHECK_CACHE_TREE", 0))
1728
cache_tree_verify(the_repository, &o->result);
1729
- if (!o->result.cache_tree)
1730
- o->result.cache_tree = cache_tree();
1729
if (!cache_tree_fully_valid(o->result.cache_tree))
1730
cache_tree_update(&o->result,
1731
WRITE_TREE_SILENT |