diff options
| author | Elijah Newren <newren@gmail.com> | 2023-02-27 15:28:19 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-02-27 16:29:51 (GMT) |
| commit | 1ca13dd3ca6e153a2bc5b0b53555996cdd668e93 (patch) | |
| tree | 7c913cb3c4647d4de794cc279c790648be7b6074 /unpack-trees.h | |
| parent | 0d680a7158b647ced6a4e24a8687decc2ad6fb78 (diff) | |
| download | git-1ca13dd3ca6e153a2bc5b0b53555996cdd668e93.zip git-1ca13dd3ca6e153a2bc5b0b53555996cdd668e93.tar.gz git-1ca13dd3ca6e153a2bc5b0b53555996cdd668e93.tar.bz2 | |
unpack-trees: special case read-tree debugging as internal usage
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>
Diffstat (limited to 'unpack-trees.h')
| -rw-r--r-- | unpack-trees.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/unpack-trees.h b/unpack-trees.h index 0335c89..e8737ad 100644 --- a/unpack-trees.h +++ b/unpack-trees.h @@ -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; |