diff options
| author | Derrick Stolee <dstolee@microsoft.com> | 2018-08-20 16:52:08 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-20 22:31:40 (GMT) |
| commit | 6a22d521260f86dff8fe6f23ab329cebb62ba4f0 (patch) | |
| tree | 237fa62a453e91ee2e806f8eb46fbf42eed4e022 /t/t5319-multi-pack-index.sh | |
| parent | e9ab2ed7de33a399b44295628e587db6a57bf897 (diff) | |
| download | git-6a22d521260f86dff8fe6f23ab329cebb62ba4f0.zip git-6a22d521260f86dff8fe6f23ab329cebb62ba4f0.tar.gz git-6a22d521260f86dff8fe6f23ab329cebb62ba4f0.tar.bz2 | |
pack-objects: consider packs in multi-pack-index
When running 'git pack-objects --local', we want to avoid packing
objects that are in an alternate. Currently, we check for these
objects using the packed_git_mru list, which excludes the pack-files
covered by a multi-pack-index.
Add a new iteration over the multi-pack-indexes to find these
copies and mark them as unwanted.
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5319-multi-pack-index.sh')
| -rwxr-xr-x | t/t5319-multi-pack-index.sh | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/t/t5319-multi-pack-index.sh b/t/t5319-multi-pack-index.sh index 424d0c6..6f56b38 100755 --- a/t/t5319-multi-pack-index.sh +++ b/t/t5319-multi-pack-index.sh @@ -176,7 +176,13 @@ test_expect_success 'multi-pack-index and alternates' ' compare_results_with_midx "with alternate (local midx)" test_expect_success 'multi-pack-index in an alternate' ' - mv .git/objects/pack/* alt.git/objects/pack + mv .git/objects/pack/* alt.git/objects/pack && + test_commit add_local_objects && + git repack --local && + git multi-pack-index write && + midx_read_expect 1 3 4 $objdir && + git reset --hard HEAD~1 && + rm -f .git/objects/pack/* ' compare_results_with_midx "with alternate (remote midx)" |