]> git.ipfire.org Git - thirdparty/git.git/commit
builtin/repack.c: ensure that `names` is sorted
authorTaylor Blau <me@ttaylorr.com>
Fri, 20 May 2022 19:01:51 +0000 (15:01 -0400)
committerJunio C Hamano <gitster@pobox.com>
Fri, 20 May 2022 20:54:44 +0000 (13:54 -0700)
commit66731ff921a56cf3e7049fae614fcf7eec663bde
treec6be5489ef06484b1a08f0015fade4e48d7d3123
parentaab7bea14fee0f185b26413bf27a1cfefbe0114d
builtin/repack.c: ensure that `names` is sorted

The previous patch demonstrates a scenario where the list of packs
written by `pack-objects` (and stored in the `names` string_list) is
out-of-order, and can thus cause us to delete packs we shouldn't.

This patch resolves that bug by ensuring that `names` is sorted in all
cases, not just when

    delete_redundant && pack_everything & ALL_INTO_ONE

is true.

Because we did sort `names` in that case (which, prior to `--geometric`
repacks, was the only time we would actually delete packs, this is only
a bug for `--geometric` repacks.

It would be sufficient to only sort `names` when `delete_redundant` is
set to a non-zero value. But sorting a small list of strings is cheap,
and it is defensive against future calls to `string_list_has_string()`
on this list.

Co-discovered-by: Victoria Dye <vdye@github.com>
Signed-off-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/repack.c
t/t7703-repack-geometric.sh