diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-06-23 21:21:17 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-06-23 21:21:17 +0300 |
| commit | 1d15be363ccf0ff4337886568087d0467c93c9a9 (patch) | |
| tree | 3fd02937071ffdc5a3b70a7a55757cfd6d622292 /pack-bitmap.c | |
| parent | 58ecb2e3838b1dfd9c3705de88dcd491fa4e44fc (diff) | |
| parent | 06f38678654eb40c46fe09ec52ae9f864ccafa03 (diff) | |
Merge branch 'tb/open-midx-bitmap-fallback'
Gracefully deal with a stale MIDX file that lists a packfile that
no longer exists.
* tb/open-midx-bitmap-fallback:
pack-bitmap.c: gracefully degrade on failure to load MIDX'd pack
Diffstat (limited to 'pack-bitmap.c')
| -rw-r--r-- | pack-bitmap.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pack-bitmap.c b/pack-bitmap.c index 894bff02c5..35669e2478 100644 --- a/pack-bitmap.c +++ b/pack-bitmap.c @@ -387,9 +387,11 @@ static int open_midx_bitmap_1(struct bitmap_index *bitmap_git, } for (i = 0; i < bitmap_git->midx->num_packs; i++) { - if (prepare_midx_pack(the_repository, bitmap_git->midx, i)) - die(_("could not open pack %s"), - bitmap_git->midx->pack_names[i]); + if (prepare_midx_pack(the_repository, bitmap_git->midx, i)) { + warning(_("could not open pack %s"), + bitmap_git->midx->pack_names[i]); + goto cleanup; + } } preferred = bitmap_git->midx->packs[midx_preferred_pack(bitmap_git)]; |