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

t/helper/test-read-midx.c: add --checksum mode

Browse Source 
Subsequent tests will want to check for the existence of a multi-pack
bitmap which matches the multi-pack-index stored in the pack directory.

The multi-pack bitmap includes the hex checksum of the MIDX it
corresponds to in its filename (for example,
'$packdir/multi-pack-index-<checksum>.bitmap'). As a result, some tests
want a way to learn what '<checksum>' is.

This helper addresses that need by printing the checksum of the
repository's multi-pack-index.

Signed-off-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Taylor Blau 2021-08-31 16:52:28 -04:00 committed by Junio C Hamano
parent aeb4657242
commit b1b82d1c30
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
t/helper/test-read-midx.c
View File

@ -60,12 +60,26 @@ static int read_midx_file(const char *object_dir, int show_objects)
return 0; return 0;
} }
static int read_midx_checksum(const char *object_dir)
{
struct multi_pack_index *m;
setup_git_directory();
m = load_multi_pack_index(object_dir, 1);
if (!m)
return 1;
printf("%s\n", hash_to_hex(get_midx_checksum(m)));
return 0;
}
int cmd__read_midx(int argc, const char **argv) int cmd__read_midx(int argc, const char **argv)
{ {
if (!(argc == 2 || argc == 3)) if (!(argc == 2 || argc == 3))
usage("read-midx [--show-objects] <object-dir>"); usage("read-midx [--show-objects|--checksum] <object-dir>");
if (!strcmp(argv[1], "--show-objects")) if (!strcmp(argv[1], "--show-objects"))
return read_midx_file(argv[2], 1); return read_midx_file(argv[2], 1);
else if (!strcmp(argv[1], "--checksum"))
return read_midx_checksum(argv[2]);
return read_midx_file(argv[1], 0); return read_midx_file(argv[1], 0);
} }

4
t/lib-bitmap.sh
View File

@ -260,3 +260,7 @@ have_delta () {
echo $1 | git cat-file --batch-check="%(deltabase)" >actual && echo $1 | git cat-file --batch-check="%(deltabase)" >actual &&
test_cmp expect actual test_cmp expect actual
} }
midx_checksum () {
test-tool read-midx --checksum "$1"
}