undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pack-objects: fix error when same packfile is included and excluded

Browse Source 
When passing the same packfile both as included and excluded via the
`--stdin-packs` option, then we will return an error because the
excluded packfile cannot be found. This is because we will only set the
`util` pointer for the included packfile list if it was found, so that
we later die when we notice that it's in fact not set for the excluded
packfile list.

Fix this bug by always setting the `util` pointer for both the included
and excluded list entries.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Patrick Steinhardt 2023-04-14 08:01:54 +02:00 committed by Junio C Hamano
parent 732194b5f2
commit 752b465c3c
2 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
builtin/pack-objects.c
View File

@ -3351,11 +3351,9 @@ static void read_packs_list_from_stdin(void)
for (p = get_all_packs(the_repository); p; p = p->next) {
const char *pack_name = pack_basename(p);
item = string_list_lookup(&include_packs, pack_name);
if (!item)
item = string_list_lookup(&exclude_packs, pack_name);
if (item)
if ((item = string_list_lookup(&include_packs, pack_name)))
item->util = p;
if ((item = string_list_lookup(&exclude_packs, pack_name)))
item->util = p;
}

20
t/t5331-pack-objects-stdin.sh
View File

@ -169,4 +169,24 @@ test_expect_success 'pack-objects --stdin with duplicate packfile' '
)
'
test_expect_success 'pack-objects --stdin with same packfile excluded and included' '
test_when_finished "rm -fr repo" &&
git init repo &&
(
cd repo &&
test_commit "commit" &&
git repack -ad &&
{
basename .git/objects/pack/pack-*.pack &&
printf "^%s\n" "$(basename .git/objects/pack/pack-*.pack)"
} >packfiles &&
git pack-objects --stdin-packs generated-pack <packfiles &&
packed_objects generated-pack-*.idx >packed-objects &&
test_must_be_empty packed-objects
)
'
test_done