unpack-trees: rewrap a few overlong lines from previous patch
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>
Elijah Newren committed
Feb 27, 2023 at 15:28 UTC
0d680a7158b647ced6a4e24a8687decc2ad6fb78
1 file changed
+9
-7
unpack-trees.c
+9
-7
@@ -1213,8 +1213,8 @@ static int unpack_single_entry(int n, unsigned long mask,
1213
* cache entry from the index aware logic.
1214
*/
1215
src[i + o->merge] = create_ce_entry(info, names + i, stage,
1216
- &o->internal.result, o->merge,
1217
- bit & dirmask);
1216
+ &o->internal.result,
1217
+ o->merge, bit & dirmask);
1218
}
1219
1220
if (o->merge) {
@@ -1918,14 +1918,15 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options
1918
} else if (o->src_index == o->dst_index) {
1919
/*
1920
* o->dst_index (and thus o->src_index) will be discarded
1921
- * and overwritten with o->internal.result at the end of this function,
1922
- * so just use src_index's split_index to avoid having to
1923
- * create a new one.
1921
+ * and overwritten with o->internal.result at the end of
1922
+ * this function, so just use src_index's split_index to
1923
+ * avoid having to create a new one.
1924
*/
1925
o->internal.result.split_index = o->src_index->split_index;
1926
o->internal.result.split_index->refcount++;
1927
} else {
1928
- o->internal.result.split_index = init_split_index(&o->internal.result);
1928
+ o->internal.result.split_index =
1929
+ init_split_index(&o->internal.result);
1930
}
1931
oidcpy(&o->internal.result.oid, &o->src_index->oid);
1932
o->merge_size = len;
@@ -2049,7 +2050,8 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options
2050
move_index_extensions(&o->internal.result, o->src_index);
2051
if (!ret) {
2052
if (git_env_bool("GIT_TEST_CHECK_CACHE_TREE", 0))
2052
- cache_tree_verify(the_repository, &o->internal.result);
2053
+ cache_tree_verify(the_repository,
2054
+ &o->internal.result);
2055
if (!o->skip_cache_tree_update &&
2056
!cache_tree_fully_valid(o->internal.result.cache_tree))
2057
cache_tree_update(&o->internal.result,