All of lore.kernel.org
 help / color / mirror / Atom feed
From: David Lin <davidzylin@gmail.com>
To: git@vger.kernel.org
Cc: ps@pks.im, gitster@pobox.com, David Lin <davidlin@stripe.com>
Subject: [PATCH] cache-tree: fix inverted object existence check in cache_tree_fully_valid
Date: Mon,  6 Apr 2026 11:14:56 -0400	[thread overview]
Message-ID: <20260406151456.63620-1-davidlin@stripe.com> (raw)

cache_tree_fully_valid() is supposed to return 0 (not valid) when a
tree object is missing from the object database. The condition
currently returns 0 when odb_has_object() succeeds, which is the
opposite of what is intended: the cache tree should be considered
invalid when the object does not exist.

Add the missing negation so the function correctly invalidates cache
tree nodes whose objects are absent.

Signed-off-by: David Lin <davidlin@stripe.com>
---
 cache-tree.c          | 2 +-
 t/t0090-cache-tree.sh | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

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++) {
diff --git a/t/t0090-cache-tree.sh b/t/t0090-cache-tree.sh
index d901588294..2c6b7a0899 100755
--- a/t/t0090-cache-tree.sh
+++ b/t/t0090-cache-tree.sh
@@ -278,4 +278,12 @@ test_expect_success 'switching trees does not invalidate shared index' '
 	)
 '
 
+test_expect_success 'cache-tree is used by write-tree when valid' '
+	test_commit use-valid &&
+
+	# write-tree with a valid cache-tree should skip cache_tree_update
+	GIT_TRACE2_PERF="$(pwd)/trace.output" git write-tree &&
+	! grep region_enter.*cache_tree.*update trace.output
+'
+
 test_done

base-commit: 2855562ca6a9c6b0e7bc780b050c1e83c9fcfbd0
-- 
2.52.0.ge17bebe515.stripe


             reply	other threads:[~2026-04-06 15:15 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-04-06 15:14 David Lin [this message]
2026-04-06 18:10 ` [PATCH] cache-tree: fix inverted object existence check in cache_tree_fully_valid Derrick Stolee
2026-04-06 18:49   ` Junio C Hamano
2026-04-06 19:27     ` [PATCH v2] " David Lin
2026-04-07  5:15       ` Patrick Steinhardt

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20260406151456.63620-1-davidlin@stripe.com \
    --to=davidzylin@gmail.com \
    --cc=davidlin@stripe.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=ps@pks.im \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.