From: Patrick Steinhardt Date: Fri, 30 Oct 2026 09:31:26 GMT Subject: Re: [PATCH] unpack-trees: hide verify_uptodate() Message-ID: In-Reply-To: On Wed, Oct 28, 2026 at 02:03:08PM -0700, Junio C Hamano wrote: > 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 Heh, this commit message confused me for a second, until I remembered the discussion that we had around it back then. > external caller of this function want away. But history checks out... > 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); > - ... and the diff looks good. So assuming this compiles and links the change is obviously correct. Thanks! Patrick