From: Junio C Hamano Date: Fri, 30 Oct 2026 17:39:56 GMT Subject: [PATCH 4/4] unpack-trees: hide verify_uptodate() Message-ID: <20261030173956.585250-5-gitster@pobox.com> In-Reply-To: <20261030173956.585250-1-gitster@pobox.com> 64b1abe962 (merge-recursive: fix overwriting dirty files involved in renames, 2018-04-19) made this function available to external callers. With the removal of the "recursive" strategy in ad45b327c0 (merge-recursive.[ch]: thoroughly debug these, 2025-04-08), the last external caller of this function want away. Make it file-scope static again. Signed-off-by: Junio C Hamano --- unpack-trees.c | 4 ++-- unpack-trees.h | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/unpack-trees.c b/unpack-trees.c index 1802809ad3..3298773490 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -2269,8 +2269,8 @@ static int verify_uptodate_1(const struct cache_entry *ce, return add_rejected_path(o, error_type, ce->name); } -int verify_uptodate(const struct cache_entry *ce, - struct unpack_trees_options *o) +static int verify_uptodate(const struct cache_entry *ce, + struct unpack_trees_options *o) { if (!o->skip_sparse_checkout && (ce->ce_flags & CE_SKIP_WORKTREE) && diff --git a/unpack-trees.h b/unpack-trees.h index 5867e26e17..638a6b076d 100644 --- a/unpack-trees.h +++ b/unpack-trees.h @@ -123,9 +123,6 @@ enum update_sparsity_result { enum update_sparsity_result update_sparsity(struct unpack_trees_options *options, struct pattern_list *pl); -int verify_uptodate(const struct cache_entry *ce, - struct unpack_trees_options *o); - int threeway_merge(const struct cache_entry * const *stages, struct unpack_trees_options *o); int twoway_merge(const struct cache_entry * const *src, -- 2.56.0-486-gd49ba3b80a