diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-10-27 15:26:14 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-10-27 15:26:15 -0700 |
| commit | 839fc31de9b67d70ce936f0ce789c5cb2c39fbe4 (patch) | |
| tree | b4e3db1d223fafa1fcfcab7a1a7db27bc5557906 | |
| parent | Sync with 'master' (diff) | |
| parent | t7900: fix a flaky test due to git-repack always regenerating MIDX (diff) | |
| download | git-839fc31de9b67d70ce936f0ce789c5cb2c39fbe4.tar.gz git-839fc31de9b67d70ce936f0ce789c5cb2c39fbe4.zip | |
Merge branch 'ps/maintenance-geometric' into next
"git maintenance" command learns the "geometric" strategy where it
avoids doing maintenance tasks that rebuilds everything from
scratch.
* ps/maintenance-geometric:
t7900: fix a flaky test due to git-repack always regenerating MIDX
| -rwxr-xr-x | t/t7900-maintenance.sh | 4 |
1 files 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 |