kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'jk/fetch-check-graph-objects-fix' 

Under a race against another process that is repacking the
repository, especially a partially cloned one, "git fetch" may
mistakenly think some objects we do have are missing, which has
been corrected.

* jk/fetch-check-graph-objects-fix:
  fetch-pack: re-scan when double-checking graph objects
main
Junio C Hamano 2025-08-28 11:28:58 -07:00
parent c039684293 8f32a5a6c0
commit 56072ff038
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fetch-pack.c
View File

@ -143,7 +143,8 @@ static struct commit *deref_without_lazy_fetch(const struct object_id *oid,
commit = lookup_commit_in_graph(the_repository, oid); commit = lookup_commit_in_graph(the_repository, oid);
if (commit) { if (commit) {
if (mark_tags_complete_and_check_obj_db) { if (mark_tags_complete_and_check_obj_db) {
if (!odb_has_object(the_repository->objects, oid, 0)) if (!odb_has_object(the_repository->objects, oid,
HAS_OBJECT_RECHECK_PACKED))
die_in_commit_graph_only(oid); die_in_commit_graph_only(oid);
} }
return commit; return commit;