summaryrefslogtreecommitdiff
path: root/builtin/pack-redundant.c
diff options
context:
space:
mode:
authorJiang Xin <zhiyou.jx@alibaba-inc.com>2020-12-17 01:57:09 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-12-17 05:21:06 (GMT)
commit0696232390d237b64f970e538177ecfd979020d0 (patch)
tree06369b56bef2d80649ab4a862c0dc6b4f6e31273 /builtin/pack-redundant.c
parent898f80736c75878acc02dc55672317fcc0e0a5a6 (diff)
downloadgit-0696232390d237b64f970e538177ecfd979020d0.zip
git-0696232390d237b64f970e538177ecfd979020d0.tar.gz
git-0696232390d237b64f970e538177ecfd979020d0.tar.bz2
pack-redundant: fix crash when one packfile in repo
Command `git pack-redundant --all` will crash if there is only one packfile in the repository. This is because, if there is only one packfile in local_packs, `cmp_local_packs` will do nothing and will leave `pl->unique_objects` as uninitialized. Also add testcases for repository with no packfile and one packfile in t5323. Reported-by: Daniel C. Klauer <daniel.c.klauer@web.de> Signed-off-by: Jiang Xin <zhiyou.jx@alibaba-inc.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/pack-redundant.c')
-rw-r--r--builtin/pack-redundant.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/builtin/pack-redundant.c b/builtin/pack-redundant.c
index 178e340..690775f 100644
--- a/builtin/pack-redundant.c
+++ b/builtin/pack-redundant.c
@@ -473,6 +473,12 @@ static void cmp_local_packs(void)
{
struct pack_list *subset, *pl = local_packs;
+ /* only one packfile */
+ if (!pl->next) {
+ llist_init(&pl->unique_objects);
+ return;
+ }
+
while ((subset = pl)) {
while ((subset = subset->next))
cmp_two_packs(pl, subset);