mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

unpack-trees: special case read-tree debugging as internal usage

Browse Source 
builtin/read-tree.c has some special functionality explicitly designed
for debugging unpack-trees.[ch].  Associated with that is two fields
that no other external caller would or should use.  Mark these as
internal to unpack-trees, but allow builtin/read-tree to read or write
them for this special case.

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:19 +00:00
committed by Junio C Hamano
parent 0d680a7158
commit 1ca13dd3ca
3 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
unpack-trees.h
View File

@ -65,7 +65,6 @@ struct unpack_trees_options {
skip_unmerged,
initial_checkout,
diff_index_cached,
debug_unpack,
skip_sparse_checkout,
quiet,
exiting_early,
@ -78,7 +77,6 @@ struct unpack_trees_options {
merge_fn_t fn;
int head_idx;
int merge_size;
struct cache_entry *df_conflict_entry;
void *unpack_data;
@ -90,8 +88,10 @@ struct unpack_trees_options {
struct unpack_trees_options_internal {
unsigned int nontrivial_merge,
show_all_errors;
show_all_errors,
debug_unpack; /* used by read-tree debugging */
int merge_size; /* used by read-tree debugging */
int cache_bottom;
const char *msgs[NB_UNPACK_TREES_WARNING_TYPES];
struct strvec msgs_to_free;