From: Junio C Hamano Date: Thu, 9 Apr 2026 18:22:18 +0000 (-0700) Subject: Merge branch 'dl/cache-tree-fully-valid-fix' into jch X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3d6167ffbc2b5334cb8dfa3f9564b7e6b82c59d2;p=thirdparty%2Fgit.git Merge branch 'dl/cache-tree-fully-valid-fix' into jch The check that implements the logic to see if an in-core cache-tree is fully ready to write out a tree object was broken, which has been corrected. * dl/cache-tree-fully-valid-fix: cache-tree: fix inverted object existence check in cache_tree_fully_valid --- 3d6167ffbc2b5334cb8dfa3f9564b7e6b82c59d2 diff --cc cache-tree.c index 7881b42aa2,366b1d7dcd..2b636eb3f8 --- a/cache-tree.c +++ b/cache-tree.c @@@ -238,8 -239,8 +238,8 @@@ int cache_tree_fully_valid(struct cache if (!it) return 0; if (it->entry_count < 0 || - odb_has_object(the_repository->objects, &it->oid, - ODB_HAS_OBJECT_RECHECK_PACKED | ODB_HAS_OBJECT_FETCH_PROMISOR)) + !odb_has_object(the_repository->objects, &it->oid, - HAS_OBJECT_RECHECK_PACKED | HAS_OBJECT_FETCH_PROMISOR)) ++ ODB_HAS_OBJECT_RECHECK_PACKED | ODB_HAS_OBJECT_FETCH_PROMISOR)) return 0; for (i = 0; i < it->subtree_nr; i++) { if (!cache_tree_fully_valid(it->down[i]->cache_tree))