From: Patrick Steinhardt Date: Tue, 07 Apr 2026 05:15:12 GMT Subject: Re: [PATCH v2] cache-tree: fix inverted object existence check in cache_tree_fully_valid Message-ID: In-Reply-To: <20260406192711.68870-1-davidlin@stripe.com> On Mon, Apr 06, 2026 at 03:27:11PM -0400, David Lin wrote: > The negation in front of the object existence check in > cache_tree_fully_valid() was lost in 062b914c84 (treewide: convert > users of `repo_has_object_file()` to `has_object()`, 2025-04-29), > turning `!repo_has_object_file(...)` into `has_object(...)` instead > of `!has_object(...)`. > > This makes cache_tree_fully_valid() always report the cache tree as > invalid when objects exist (the common case), forcing callers like > write_index_as_tree() to call cache_tree_update() on every > invocation. An odb_has_object() check inside update_one() avoids a > full tree rebuild, but the unnecessary call still pays the cost of > opening an ODB transaction and, in partial clones, a promisor remote > check. > > Restore the missing negation and add a test that verifies write-tree > takes the cache-tree shortcut when the cache tree is valid. Oh, indeed, thanks for the fix. I also checked whether there's any other such case in the commit in question, but didn't spot any. > diff --git a/cache-tree.c b/cache-tree.c > index 60bcc07c3b..9fe057355c 100644 > --- a/cache-tree.c > +++ b/cache-tree.c > @@ -238,7 +238,7 @@ int cache_tree_fully_valid(struct cache_tree *it) > if (!it) > return 0; > if (it->entry_count < 0 || > - odb_has_object(the_repository->objects, &it->oid, > + !odb_has_object(the_repository->objects, &it->oid, > HAS_OBJECT_RECHECK_PACKED | HAS_OBJECT_FETCH_PROMISOR)) > return 0; > for (i = 0; i < it->subtree_nr; i++) { Yup, this looks obviously good to me. Patrick