]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'tb/midx-race-in-pack-objects'
authorJunio C Hamano <gitster@pobox.com>
Fri, 3 Jun 2022 21:30:35 +0000 (14:30 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 3 Jun 2022 21:30:35 +0000 (14:30 -0700)
The multi-pack-index code did not protect the packfile it is going
to depend on from getting removed while in use, which has been
corrected.

* tb/midx-race-in-pack-objects:
  builtin/pack-objects.c: ensure pack validity from MIDX bitmap objects
  builtin/pack-objects.c: ensure included `--stdin-packs` exist
  builtin/pack-objects.c: avoid redundant NULL check
  pack-bitmap.c: check preferred pack validity when opening MIDX bitmap

1  2 
builtin/pack-objects.c
pack-bitmap.c

Simple merge
diff --cc pack-bitmap.c
Simple merge