Skip to content

Commit a426557

Browse files
pks-tgitster
authored andcommitted
t7900: fix a flaky test due to git-repack always regenerating MIDX
When a supposedly no-op "git repack" runs across a second boundary, because the command always touches the MIDX file and updates its timestamp, "ls -l $GIT_DIR/objects/pack/" before and after the operation can change, which causes such a test to fail. Only compare the *.pack files in the directory before and after the operation to work around this flakyness. Arguably, git-repack(1) should learn to not rewrite the MIDX in case we know it is already up-to-date. But this is not a new problem introduced via the new geometric maintenance task, so for now it should be good enough to paper over the issue. Signed-off-by: Patrick Steinhardt <[email protected]> [jc: taken from diff to v4 from v3 that was already merged to 'next'] Signed-off-by: Junio C Hamano <[email protected]>
1 parent d9bccf2 commit a426557

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

t/t7900-maintenance.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -500,9 +500,9 @@ test_expect_success 'geometric repacking task' '
500500
501501
# Repacking should now cause a no-op geometric repack because
502502
# no packfiles need to be combined.
503-
ls -l .git/objects/pack >before &&
503+
ls -l .git/objects/pack/*.pack >before &&
504504
run_and_verify_geometric_pack 1 &&
505-
ls -l .git/objects/pack >after &&
505+
ls -l .git/objects/pack/*.pack >after &&
506506
test_cmp before after &&
507507
508508
# This incremental change creates a new packfile that only

0 commit comments

Comments
 (0)