diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-10-27 15:24:11 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-10-27 15:24:11 -0700 |
| commit | a9514e3b95028571c64f636082814fd5119df65d (patch) | |
| tree | 20b989eb9c2f4bf7feac5e62cd2f51c9bdc1f9a3 /Documentation | |
| parent | 1b97c136cc84cb8e65c4c45a717e6cb816841889 (diff) | |
| parent | b62ad5681f7ff08065d172f541ab2578d7b38e18 (diff) | |
| download | git-a9514e3b95028571c64f636082814fd5119df65d.tar.gz | |
Merge branch 'tb/midx-repack-ignore-cruft-packs' into maint-2.38
"git multi-pack-index repack/expire" used to repack unreachable
cruft into a new pack, which have been corrected.
cf. <63a1c3d4-eff3-af10-4263-058c88e74594@github.com>
* tb/midx-repack-ignore-cruft-packs:
midx.c: avoid cruft packs with non-zero `repack --batch-size`
midx.c: remove unnecessary loop condition
midx.c: replace `xcalloc()` with `CALLOC_ARRAY()`
midx.c: avoid cruft packs with `repack --batch-size=0`
midx.c: prevent `expire` from removing the cruft pack
Documentation/git-multi-pack-index.txt: clarify expire behavior
Documentation/git-multi-pack-index.txt: fix typo
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-multi-pack-index.txt | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Documentation/git-multi-pack-index.txt b/Documentation/git-multi-pack-index.txt index a48c3d5ea6..3696506eb3 100644 --- a/Documentation/git-multi-pack-index.txt +++ b/Documentation/git-multi-pack-index.txt @@ -70,9 +70,10 @@ verify:: Verify the contents of the MIDX file. expire:: - Delete the pack-files that are tracked by the MIDX file, but - have no objects referenced by the MIDX. Rewrite the MIDX file - afterward to remove all references to these pack-files. + Delete the pack-files that are tracked by the MIDX file, but + have no objects referenced by the MIDX (with the exception of + `.keep` packs and cruft packs). Rewrite the MIDX file afterward + to remove all references to these pack-files. repack:: Create a new pack-file containing objects in small pack-files |