Re: [PATCH v4 00/10] builtin/maintenance: introduce "geometric" strategy
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Oct 27, 2025, 15:53 UTC
- Message-ID
- <xmqqtszkjq8d.fsf@gitster.g>
- In-Reply-To
- <20251027-pks-maintenance-geometric-strategy-v4-0-18049e4a0adf@pks.im>
Patrick Steinhardt <ps@pks.im> writes:
Show 5 quoted lines
> Changes in v4: > - Fix a flaky test because git-repack(1) always decides to rewrite the > MIDX, even though no packs have changed. This isn't a new issue, and > other maintenance tasks behave the same. So I decided to punt on it > for now.
Thanks, but this round raced against 'next', so let me fabricate the following and queue it instead.
------- >8 ------- From: Patrick Steinhardt <ps@pks.im> Date: Mon, 27 Oct 2025 09:30:50 +0100 Subject: [PATCH] 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.
Signed-off-by: Patrick Steinhardt <ps@pks.im> [jc: taken from diff to v4 from v3 that was already merged to 'next'] Signed-off-by: Junio C Hamano <gitster@pobox.com> --- t/t7900-maintenance.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/t7900-maintenance.sh b/t/t7900-maintenance.sh index 0d76693fee..614184a097 100755 --- a/t/t7900-maintenance.sh +++ b/t/t7900-maintenance.sh @@ -500,9 +500,9 @@ test_expect_success 'geometric repacking task' ' # Repacking should now cause a no-op geometric repack because # no packfiles need to be combined. - ls -l .git/objects/pack >before && + ls -l .git/objects/pack/*.pack >before && run_and_verify_geometric_pack 1 && - ls -l .git/objects/pack >after && + ls -l .git/objects/pack/*.pack >after && test_cmp before after && # This incremental change creates a new packfile that only
-- 2.51.2-678-g0cd646409c