undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

unpack-trees: rewrap a few overlong lines from previous patch

Browse Source 
The previous patch made many lines a little longer, resulting in four
becoming a bit too long.  They were left as-is for the previous patch
to facilitate reviewers verifying that we were just adding "internal."
in a bunch of places, but rewrap them now.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Elijah Newren 2023-02-27 15:28:18 +00:00 committed by Junio C Hamano
parent 13e1fd6e38
commit 0d680a7158
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
unpack-trees.c
View File

@ -1213,8 +1213,8 @@ static int unpack_single_entry(int n, unsigned long mask,
* cache entry from the index aware logic. * cache entry from the index aware logic.
*/ */
src[i + o->merge] = create_ce_entry(info, names + i, stage, src[i + o->merge] = create_ce_entry(info, names + i, stage,
&o->internal.result, o->merge, &o->internal.result,
bit & dirmask); o->merge, bit & dirmask);
} }
if (o->merge) { if (o->merge) {
@ -1918,14 +1918,15 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options
} else if (o->src_index == o->dst_index) { } else if (o->src_index == o->dst_index) {
/* /*
* o->dst_index (and thus o->src_index) will be discarded * o->dst_index (and thus o->src_index) will be discarded
* and overwritten with o->internal.result at the end of this function, * and overwritten with o->internal.result at the end of
* so just use src_index's split_index to avoid having to * this function, so just use src_index's split_index to
* create a new one. * avoid having to create a new one.
*/ */
o->internal.result.split_index = o->src_index->split_index; o->internal.result.split_index = o->src_index->split_index;
o->internal.result.split_index->refcount++; o->internal.result.split_index->refcount++;
} else { } else {
o->internal.result.split_index = init_split_index(&o->internal.result); o->internal.result.split_index =
init_split_index(&o->internal.result);
} }
oidcpy(&o->internal.result.oid, &o->src_index->oid); oidcpy(&o->internal.result.oid, &o->src_index->oid);
o->merge_size = len; o->merge_size = len;
@ -2049,7 +2050,8 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options
move_index_extensions(&o->internal.result, o->src_index); move_index_extensions(&o->internal.result, o->src_index);
if (!ret) { if (!ret) {
if (git_env_bool("GIT_TEST_CHECK_CACHE_TREE", 0)) if (git_env_bool("GIT_TEST_CHECK_CACHE_TREE", 0))
cache_tree_verify(the_repository, &o->internal.result); cache_tree_verify(the_repository,
&o->internal.result);
if (!o->skip_cache_tree_update && if (!o->skip_cache_tree_update &&
!cache_tree_fully_valid(o->internal.result.cache_tree)) !cache_tree_fully_valid(o->internal.result.cache_tree))
cache_tree_update(&o->internal.result, cache_tree_update(&o->internal.result,