2017-11-21 20:58:52 +00:00
|
|
|
#!/bin/sh
|
|
|
|
|
|
|
|
test_description='git pack-objects using object filtering'
|
|
|
|
|
2020-11-18 23:44:29 +00:00
|
|
|
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
|
tests: mark tests relying on the current default for `init.defaultBranch`
In addition to the manual adjustment to let the `linux-gcc` CI job run
the test suite with `master` and then with `main`, this patch makes sure
that GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME is set in all test scripts
that currently rely on the initial branch name being `master by default.
To determine which test scripts to mark up, the first step was to
force-set the default branch name to `master` in
- all test scripts that contain the keyword `master`,
- t4211, which expects `t/t4211/history.export` with a hard-coded ref to
initialize the default branch,
- t5560 because it sources `t/t556x_common` which uses `master`,
- t8002 and t8012 because both source `t/annotate-tests.sh` which also
uses `master`)
This trick was performed by this command:
$ sed -i '/^ *\. \.\/\(test-lib\|lib-\(bash\|cvs\|git-svn\)\|gitweb-lib\)\.sh$/i\
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master\
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\
' $(git grep -l master t/t[0-9]*.sh) \
t/t4211*.sh t/t5560*.sh t/t8002*.sh t/t8012*.sh
After that, careful, manual inspection revealed that some of the test
scripts containing the needle `master` do not actually rely on a
specific default branch name: either they mention `master` only in a
comment, or they initialize that branch specificially, or they do not
actually refer to the current default branch. Therefore, the
aforementioned modification was undone in those test scripts thusly:
$ git checkout HEAD -- \
t/t0027-auto-crlf.sh t/t0060-path-utils.sh \
t/t1011-read-tree-sparse-checkout.sh \
t/t1305-config-include.sh t/t1309-early-config.sh \
t/t1402-check-ref-format.sh t/t1450-fsck.sh \
t/t2024-checkout-dwim.sh \
t/t2106-update-index-assume-unchanged.sh \
t/t3040-subprojects-basic.sh t/t3301-notes.sh \
t/t3308-notes-merge.sh t/t3423-rebase-reword.sh \
t/t3436-rebase-more-options.sh \
t/t4015-diff-whitespace.sh t/t4257-am-interactive.sh \
t/t5323-pack-redundant.sh t/t5401-update-hooks.sh \
t/t5511-refspec.sh t/t5526-fetch-submodules.sh \
t/t5529-push-errors.sh t/t5530-upload-pack-error.sh \
t/t5548-push-porcelain.sh \
t/t5552-skipping-fetch-negotiator.sh \
t/t5572-pull-submodule.sh t/t5608-clone-2gb.sh \
t/t5614-clone-submodules-shallow.sh \
t/t7508-status.sh t/t7606-merge-custom.sh \
t/t9302-fast-import-unpack-limit.sh
We excluded one set of test scripts in these commands, though: the range
of `git p4` tests. The reason? `git p4` stores the (foreign) remote
branch in the branch called `p4/master`, which is obviously not the
default branch. Manual analysis revealed that only five of these tests
actually require a specific default branch name to pass; They were
modified thusly:
$ sed -i '/^ *\. \.\/lib-git-p4\.sh$/i\
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master\
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\
' t/t980[0167]*.sh t/t9811*.sh
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-11-18 23:44:19 +00:00
|
|
|
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
|
|
|
|
tests: mark tests as passing with SANITIZE=leak
When the "ab/various-leak-fixes" topic was merged in [1] only t6021
would fail if the tests were run in the
"GIT_TEST_PASSING_SANITIZE_LEAK=check" mode, i.e. to check whether we
marked all leak-free tests with "TEST_PASSES_SANITIZE_LEAK=true".
Since then we've had various tests starting to pass under
SANITIZE=leak. Let's mark those as passing, this is when they started
to pass, narrowed down with "git bisect":
- t5317-pack-objects-filter-objects.sh: In
faebba436e6 (list-objects-filter: plug pattern_list leak, 2022-12-01).
- t3210-pack-refs.sh, t5613-info-alternate.sh,
t7403-submodule-sync.sh: In 189e97bc4ba (diff: remove parseopts member
from struct diff_options, 2022-12-01).
- t1408-packed-refs.sh: In ab91f6b7c42 (Merge branch
'rs/diff-parseopts', 2022-12-19).
- t0023-crlf-am.sh, t4152-am-subjects.sh, t4254-am-corrupt.sh,
t4256-am-format-flowed.sh, t4257-am-interactive.sh,
t5403-post-checkout-hook.sh: In a658e881c13 (am: don't pass strvec to
apply_parse_options(), 2022-12-13)
- t1301-shared-repo.sh, t1302-repo-version.sh: In b07a819c05f (reflog:
clear leftovers in reflog_expiry_cleanup(), 2022-12-13).
- t1304-default-acl.sh, t1410-reflog.sh,
t5330-no-lazy-fetch-with-commit-graph.sh, t5502-quickfetch.sh,
t5604-clone-reference.sh, t6014-rev-list-all.sh,
t7701-repack-unpack-unreachable.sh: In b0c61be3209 (Merge branch
'rs/reflog-expiry-cleanup', 2022-12-26)
- t3800-mktag.sh, t5302-pack-index.sh, t5306-pack-nobase.sh,
t5573-pull-verify-signatures.sh, t7612-merge-verify-signatures.sh: In
69bbbe484ba (hash-object: use fsck for object checks, 2023-01-18).
- t1451-fsck-buffer.sh: In 8e4309038f0 (fsck: do not assume
NUL-termination of buffers, 2023-01-19).
- t6501-freshen-objects.sh: In abf2bb895b4 (Merge branch
'jk/hash-object-fsck', 2023-01-30)
1. 9ea1378d046 (Merge branch 'ab/various-leak-fixes', 2022-12-14)
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2023-02-06 23:07:36 +00:00
|
|
|
TEST_PASSES_SANITIZE_LEAK=true
|
2017-11-21 20:58:52 +00:00
|
|
|
. ./test-lib.sh
|
|
|
|
|
|
|
|
# Test blob:none filter.
|
|
|
|
|
|
|
|
test_expect_success 'setup r1' '
|
|
|
|
git init r1 &&
|
|
|
|
for n in 1 2 3 4 5
|
|
|
|
do
|
tests: fix broken &&-chains in compound statements
The top-level &&-chain checker built into t/test-lib.sh causes tests to
magically exit with code 117 if the &&-chain is broken. However, it has
the shortcoming that the magic does not work within `{...}` groups,
`(...)` subshells, `$(...)` substitutions, or within bodies of compound
statements, such as `if`, `for`, `while`, `case`, etc. `chainlint.sed`
partly fills in the gap by catching broken &&-chains in `(...)`
subshells, but bugs can still lurk behind broken &&-chains in the other
cases.
Fix broken &&-chains in compound statements in order to reduce the
number of possible lurking bugs.
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Reviewed-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2021-12-09 05:11:06 +00:00
|
|
|
echo "This is file: $n" > r1/file.$n &&
|
|
|
|
git -C r1 add file.$n &&
|
2021-12-09 05:11:14 +00:00
|
|
|
git -C r1 commit -m "$n" || return 1
|
2017-11-21 20:58:52 +00:00
|
|
|
done
|
|
|
|
'
|
|
|
|
|
2022-04-05 05:20:15 +00:00
|
|
|
parse_verify_pack_blob_oid () {
|
|
|
|
awk '{print $1}' -
|
|
|
|
}
|
|
|
|
|
2017-11-21 20:58:52 +00:00
|
|
|
test_expect_success 'verify blob count in normal packfile' '
|
2022-11-29 12:21:17 +00:00
|
|
|
git -C r1 ls-files -s file.1 file.2 file.3 file.4 file.5 \
|
|
|
|
>ls_files_result &&
|
|
|
|
test_parse_ls_files_stage_oids <ls_files_result |
|
2018-10-05 21:54:03 +00:00
|
|
|
sort >expected &&
|
|
|
|
|
2019-03-25 18:14:23 +00:00
|
|
|
git -C r1 pack-objects --revs --stdout >all.pack <<-EOF &&
|
2017-11-21 20:58:52 +00:00
|
|
|
HEAD
|
|
|
|
EOF
|
|
|
|
git -C r1 index-pack ../all.pack &&
|
2018-10-05 21:54:03 +00:00
|
|
|
|
2018-10-05 21:54:05 +00:00
|
|
|
git -C r1 verify-pack -v ../all.pack >verify_result &&
|
|
|
|
grep blob verify_result |
|
2022-04-05 05:20:15 +00:00
|
|
|
parse_verify_pack_blob_oid |
|
2018-10-05 21:54:03 +00:00
|
|
|
sort >observed &&
|
|
|
|
|
2018-10-05 21:54:04 +00:00
|
|
|
test_cmp expected observed
|
2017-11-21 20:58:52 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'verify blob:none packfile has no blobs' '
|
2019-03-25 18:14:23 +00:00
|
|
|
git -C r1 pack-objects --revs --stdout --filter=blob:none >filter.pack <<-EOF &&
|
2017-11-21 20:58:52 +00:00
|
|
|
HEAD
|
|
|
|
EOF
|
|
|
|
git -C r1 index-pack ../filter.pack &&
|
2018-10-05 21:54:03 +00:00
|
|
|
|
2018-10-05 21:54:05 +00:00
|
|
|
git -C r1 verify-pack -v ../filter.pack >verify_result &&
|
2019-11-27 19:53:33 +00:00
|
|
|
! grep blob verify_result
|
2017-11-21 20:58:52 +00:00
|
|
|
'
|
|
|
|
|
2023-10-02 16:54:56 +00:00
|
|
|
test_expect_success 'verify blob:none packfile without --stdout' '
|
|
|
|
git -C r1 pack-objects --revs --filter=blob:none mypackname >packhash <<-EOF &&
|
|
|
|
HEAD
|
|
|
|
EOF
|
|
|
|
git -C r1 verify-pack -v "mypackname-$(cat packhash).pack" >verify_result &&
|
|
|
|
! grep blob verify_result
|
|
|
|
'
|
|
|
|
|
2017-11-21 20:58:52 +00:00
|
|
|
test_expect_success 'verify normal and blob:none packfiles have same commits/trees' '
|
2018-10-05 21:54:05 +00:00
|
|
|
git -C r1 verify-pack -v ../all.pack >verify_result &&
|
|
|
|
grep -E "commit|tree" verify_result |
|
2022-04-05 05:20:15 +00:00
|
|
|
parse_verify_pack_blob_oid |
|
2018-10-05 21:54:03 +00:00
|
|
|
sort >expected &&
|
|
|
|
|
2018-10-05 21:54:05 +00:00
|
|
|
git -C r1 verify-pack -v ../filter.pack >verify_result &&
|
|
|
|
grep -E "commit|tree" verify_result |
|
2022-04-05 05:20:15 +00:00
|
|
|
parse_verify_pack_blob_oid |
|
2018-10-05 21:54:03 +00:00
|
|
|
sort >observed &&
|
|
|
|
|
2018-10-05 21:54:04 +00:00
|
|
|
test_cmp expected observed
|
2017-11-21 20:58:52 +00:00
|
|
|
'
|
|
|
|
|
2018-10-05 21:31:23 +00:00
|
|
|
test_expect_success 'get an error for missing tree object' '
|
|
|
|
git init r5 &&
|
|
|
|
echo foo >r5/foo &&
|
|
|
|
git -C r5 add foo &&
|
|
|
|
git -C r5 commit -m "foo" &&
|
2019-11-27 19:53:31 +00:00
|
|
|
git -C r5 rev-parse HEAD^{tree} >tree &&
|
|
|
|
del=$(sed "s|..|&/|" tree) &&
|
2018-10-05 21:31:23 +00:00
|
|
|
rm r5/.git/objects/$del &&
|
2019-03-25 18:14:23 +00:00
|
|
|
test_must_fail git -C r5 pack-objects --revs --stdout 2>bad_tree <<-EOF &&
|
2018-10-05 21:31:23 +00:00
|
|
|
HEAD
|
|
|
|
EOF
|
2018-10-12 20:01:41 +00:00
|
|
|
grep "bad tree object" bad_tree
|
2018-10-05 21:31:23 +00:00
|
|
|
'
|
|
|
|
|
2018-10-05 21:31:27 +00:00
|
|
|
test_expect_success 'setup for tests of tree:0' '
|
|
|
|
mkdir r1/subtree &&
|
|
|
|
echo "This is a file in a subtree" >r1/subtree/file &&
|
|
|
|
git -C r1 add subtree/file &&
|
|
|
|
git -C r1 commit -m subtree
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'verify tree:0 packfile has no blobs or trees' '
|
2019-03-25 18:14:23 +00:00
|
|
|
git -C r1 pack-objects --revs --stdout --filter=tree:0 >commitsonly.pack <<-EOF &&
|
2018-10-05 21:31:27 +00:00
|
|
|
HEAD
|
|
|
|
EOF
|
|
|
|
git -C r1 index-pack ../commitsonly.pack &&
|
|
|
|
git -C r1 verify-pack -v ../commitsonly.pack >objs &&
|
|
|
|
! grep -E "tree|blob" objs
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'grab tree directly when using tree:0' '
|
|
|
|
# We should get the tree specified directly but not its blobs or subtrees.
|
2019-03-25 18:14:23 +00:00
|
|
|
git -C r1 pack-objects --revs --stdout --filter=tree:0 >commitsonly.pack <<-EOF &&
|
2018-10-05 21:31:27 +00:00
|
|
|
HEAD:
|
|
|
|
EOF
|
|
|
|
git -C r1 index-pack ../commitsonly.pack &&
|
|
|
|
git -C r1 verify-pack -v ../commitsonly.pack >objs &&
|
|
|
|
awk "/tree|blob/{print \$1}" objs >trees_and_blobs &&
|
|
|
|
git -C r1 rev-parse HEAD: >expected &&
|
|
|
|
test_cmp expected trees_and_blobs
|
|
|
|
'
|
|
|
|
|
2017-11-21 20:58:52 +00:00
|
|
|
# Test blob:limit=<n>[kmg] filter.
|
|
|
|
# We boundary test around the size parameter. The filter is strictly less than
|
|
|
|
# the value, so size 500 and 1000 should have the same results, but 1001 should
|
|
|
|
# filter more.
|
|
|
|
|
|
|
|
test_expect_success 'setup r2' '
|
|
|
|
git init r2 &&
|
|
|
|
for n in 1000 10000
|
|
|
|
do
|
tests: fix broken &&-chains in compound statements
The top-level &&-chain checker built into t/test-lib.sh causes tests to
magically exit with code 117 if the &&-chain is broken. However, it has
the shortcoming that the magic does not work within `{...}` groups,
`(...)` subshells, `$(...)` substitutions, or within bodies of compound
statements, such as `if`, `for`, `while`, `case`, etc. `chainlint.sed`
partly fills in the gap by catching broken &&-chains in `(...)`
subshells, but bugs can still lurk behind broken &&-chains in the other
cases.
Fix broken &&-chains in compound statements in order to reduce the
number of possible lurking bugs.
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Reviewed-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2021-12-09 05:11:06 +00:00
|
|
|
printf "%"$n"s" X > r2/large.$n &&
|
|
|
|
git -C r2 add large.$n &&
|
2021-12-09 05:11:14 +00:00
|
|
|
git -C r2 commit -m "$n" || return 1
|
2017-11-21 20:58:52 +00:00
|
|
|
done
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'verify blob count in normal packfile' '
|
2022-11-29 12:21:17 +00:00
|
|
|
git -C r2 ls-files -s large.1000 large.10000 >ls_files_result &&
|
|
|
|
test_parse_ls_files_stage_oids <ls_files_result |
|
2018-10-05 21:54:03 +00:00
|
|
|
sort >expected &&
|
|
|
|
|
2019-03-25 18:14:23 +00:00
|
|
|
git -C r2 pack-objects --revs --stdout >all.pack <<-EOF &&
|
2017-11-21 20:58:52 +00:00
|
|
|
HEAD
|
|
|
|
EOF
|
|
|
|
git -C r2 index-pack ../all.pack &&
|
2018-10-05 21:54:03 +00:00
|
|
|
|
2018-10-05 21:54:05 +00:00
|
|
|
git -C r2 verify-pack -v ../all.pack >verify_result &&
|
|
|
|
grep blob verify_result |
|
2022-04-05 05:20:15 +00:00
|
|
|
parse_verify_pack_blob_oid |
|
2018-10-05 21:54:03 +00:00
|
|
|
sort >observed &&
|
|
|
|
|
2018-10-05 21:54:04 +00:00
|
|
|
test_cmp expected observed
|
2017-11-21 20:58:52 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'verify blob:limit=500 omits all blobs' '
|
2019-03-25 18:14:23 +00:00
|
|
|
git -C r2 pack-objects --revs --stdout --filter=blob:limit=500 >filter.pack <<-EOF &&
|
2017-11-21 20:58:52 +00:00
|
|
|
HEAD
|
|
|
|
EOF
|
|
|
|
git -C r2 index-pack ../filter.pack &&
|
2018-10-05 21:54:03 +00:00
|
|
|
|
2018-10-05 21:54:05 +00:00
|
|
|
git -C r2 verify-pack -v ../filter.pack >verify_result &&
|
2019-11-27 19:53:33 +00:00
|
|
|
! grep blob verify_result
|
2017-11-21 20:58:52 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'verify blob:limit=1000' '
|
2019-03-25 18:14:23 +00:00
|
|
|
git -C r2 pack-objects --revs --stdout --filter=blob:limit=1000 >filter.pack <<-EOF &&
|
2017-11-21 20:58:52 +00:00
|
|
|
HEAD
|
|
|
|
EOF
|
|
|
|
git -C r2 index-pack ../filter.pack &&
|
2018-10-05 21:54:03 +00:00
|
|
|
|
2018-10-05 21:54:05 +00:00
|
|
|
git -C r2 verify-pack -v ../filter.pack >verify_result &&
|
2019-11-27 19:53:33 +00:00
|
|
|
! grep blob verify_result
|
2017-11-21 20:58:52 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'verify blob:limit=1001' '
|
2022-11-29 12:21:17 +00:00
|
|
|
git -C r2 ls-files -s large.1000 >ls_files_result &&
|
|
|
|
test_parse_ls_files_stage_oids <ls_files_result |
|
2018-10-05 21:54:03 +00:00
|
|
|
sort >expected &&
|
|
|
|
|
2019-03-25 18:14:23 +00:00
|
|
|
git -C r2 pack-objects --revs --stdout --filter=blob:limit=1001 >filter.pack <<-EOF &&
|
2017-11-21 20:58:52 +00:00
|
|
|
HEAD
|
|
|
|
EOF
|
|
|
|
git -C r2 index-pack ../filter.pack &&
|
2018-10-05 21:54:03 +00:00
|
|
|
|
2018-10-05 21:54:05 +00:00
|
|
|
git -C r2 verify-pack -v ../filter.pack >verify_result &&
|
|
|
|
grep blob verify_result |
|
2022-04-05 05:20:15 +00:00
|
|
|
parse_verify_pack_blob_oid |
|
2018-10-05 21:54:03 +00:00
|
|
|
sort >observed &&
|
|
|
|
|
2018-10-05 21:54:04 +00:00
|
|
|
test_cmp expected observed
|
2017-11-21 20:58:52 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'verify blob:limit=10001' '
|
2022-11-29 12:21:17 +00:00
|
|
|
git -C r2 ls-files -s large.1000 large.10000 >ls_files_result &&
|
|
|
|
test_parse_ls_files_stage_oids <ls_files_result |
|
2018-10-05 21:54:03 +00:00
|
|
|
sort >expected &&
|
|
|
|
|
2019-03-25 18:14:23 +00:00
|
|
|
git -C r2 pack-objects --revs --stdout --filter=blob:limit=10001 >filter.pack <<-EOF &&
|
2017-11-21 20:58:52 +00:00
|
|
|
HEAD
|
|
|
|
EOF
|
|
|
|
git -C r2 index-pack ../filter.pack &&
|
2018-10-05 21:54:03 +00:00
|
|
|
|
2018-10-05 21:54:05 +00:00
|
|
|
git -C r2 verify-pack -v ../filter.pack >verify_result &&
|
|
|
|
grep blob verify_result |
|
2022-04-05 05:20:15 +00:00
|
|
|
parse_verify_pack_blob_oid |
|
2018-10-05 21:54:03 +00:00
|
|
|
sort >observed &&
|
|
|
|
|
2018-10-05 21:54:04 +00:00
|
|
|
test_cmp expected observed
|
2017-11-21 20:58:52 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'verify blob:limit=1k' '
|
2022-11-29 12:21:17 +00:00
|
|
|
git -C r2 ls-files -s large.1000 >ls_files_result &&
|
|
|
|
test_parse_ls_files_stage_oids <ls_files_result |
|
2018-10-05 21:54:03 +00:00
|
|
|
sort >expected &&
|
|
|
|
|
2019-03-25 18:14:23 +00:00
|
|
|
git -C r2 pack-objects --revs --stdout --filter=blob:limit=1k >filter.pack <<-EOF &&
|
2017-11-21 20:58:52 +00:00
|
|
|
HEAD
|
|
|
|
EOF
|
|
|
|
git -C r2 index-pack ../filter.pack &&
|
2018-10-05 21:54:03 +00:00
|
|
|
|
2018-10-05 21:54:05 +00:00
|
|
|
git -C r2 verify-pack -v ../filter.pack >verify_result &&
|
|
|
|
grep blob verify_result |
|
2022-04-05 05:20:15 +00:00
|
|
|
parse_verify_pack_blob_oid |
|
2018-10-05 21:54:03 +00:00
|
|
|
sort >observed &&
|
|
|
|
|
2018-10-05 21:54:04 +00:00
|
|
|
test_cmp expected observed
|
2018-07-06 19:34:09 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'verify explicitly specifying oversized blob in input' '
|
2022-11-29 12:21:17 +00:00
|
|
|
git -C r2 ls-files -s large.1000 large.10000 >ls_files_result &&
|
|
|
|
test_parse_ls_files_stage_oids <ls_files_result |
|
2018-10-05 21:54:03 +00:00
|
|
|
sort >expected &&
|
|
|
|
|
2019-11-27 19:53:31 +00:00
|
|
|
echo HEAD >objects &&
|
|
|
|
git -C r2 rev-parse HEAD:large.10000 >>objects &&
|
|
|
|
git -C r2 pack-objects --revs --stdout --filter=blob:limit=1k <objects >filter.pack &&
|
2018-07-06 19:34:09 +00:00
|
|
|
git -C r2 index-pack ../filter.pack &&
|
2018-10-05 21:54:03 +00:00
|
|
|
|
2018-10-05 21:54:05 +00:00
|
|
|
git -C r2 verify-pack -v ../filter.pack >verify_result &&
|
|
|
|
grep blob verify_result |
|
2022-04-05 05:20:15 +00:00
|
|
|
parse_verify_pack_blob_oid |
|
2018-10-05 21:54:03 +00:00
|
|
|
sort >observed &&
|
|
|
|
|
2018-10-05 21:54:04 +00:00
|
|
|
test_cmp expected observed
|
2017-11-21 20:58:52 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'verify blob:limit=1m' '
|
2022-11-29 12:21:17 +00:00
|
|
|
git -C r2 ls-files -s large.1000 large.10000 >ls_files_result &&
|
|
|
|
test_parse_ls_files_stage_oids <ls_files_result |
|
2018-10-05 21:54:03 +00:00
|
|
|
sort >expected &&
|
|
|
|
|
2019-03-25 18:14:23 +00:00
|
|
|
git -C r2 pack-objects --revs --stdout --filter=blob:limit=1m >filter.pack <<-EOF &&
|
2017-11-21 20:58:52 +00:00
|
|
|
HEAD
|
|
|
|
EOF
|
|
|
|
git -C r2 index-pack ../filter.pack &&
|
2018-10-05 21:54:03 +00:00
|
|
|
|
2018-10-05 21:54:05 +00:00
|
|
|
git -C r2 verify-pack -v ../filter.pack >verify_result &&
|
|
|
|
grep blob verify_result |
|
2022-04-05 05:20:15 +00:00
|
|
|
parse_verify_pack_blob_oid |
|
2018-10-05 21:54:03 +00:00
|
|
|
sort >observed &&
|
|
|
|
|
2018-10-05 21:54:04 +00:00
|
|
|
test_cmp expected observed
|
2017-11-21 20:58:52 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'verify normal and blob:limit packfiles have same commits/trees' '
|
2018-10-05 21:54:05 +00:00
|
|
|
git -C r2 verify-pack -v ../all.pack >verify_result &&
|
|
|
|
grep -E "commit|tree" verify_result |
|
2022-04-05 05:20:15 +00:00
|
|
|
parse_verify_pack_blob_oid |
|
2018-10-05 21:54:03 +00:00
|
|
|
sort >expected &&
|
|
|
|
|
2018-10-05 21:54:05 +00:00
|
|
|
git -C r2 verify-pack -v ../filter.pack >verify_result &&
|
|
|
|
grep -E "commit|tree" verify_result |
|
2022-04-05 05:20:15 +00:00
|
|
|
parse_verify_pack_blob_oid |
|
2018-10-05 21:54:03 +00:00
|
|
|
sort >observed &&
|
|
|
|
|
2018-10-05 21:54:04 +00:00
|
|
|
test_cmp expected observed
|
2017-11-21 20:58:52 +00:00
|
|
|
'
|
|
|
|
|
2022-11-29 12:23:53 +00:00
|
|
|
test_expect_success 'verify small limit and big limit results in small limit' '
|
2022-11-29 12:22:26 +00:00
|
|
|
git -C r2 ls-files -s large.1000 >ls_files_result &&
|
|
|
|
test_parse_ls_files_stage_oids <ls_files_result |
|
|
|
|
sort >expected &&
|
|
|
|
|
|
|
|
git -C r2 pack-objects --revs --stdout --filter=blob:limit=1001 \
|
|
|
|
--filter=blob:limit=10001 >filter.pack <<-EOF &&
|
|
|
|
HEAD
|
|
|
|
EOF
|
|
|
|
git -C r2 index-pack ../filter.pack &&
|
|
|
|
|
|
|
|
git -C r2 verify-pack -v ../filter.pack >verify_result &&
|
|
|
|
grep blob verify_result |
|
|
|
|
parse_verify_pack_blob_oid |
|
|
|
|
sort >observed &&
|
|
|
|
|
|
|
|
test_cmp expected observed
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'verify big limit and small limit results in small limit' '
|
|
|
|
git -C r2 ls-files -s large.1000 >ls_files_result &&
|
|
|
|
test_parse_ls_files_stage_oids <ls_files_result |
|
|
|
|
sort >expected &&
|
|
|
|
|
|
|
|
git -C r2 pack-objects --revs --stdout --filter=blob:limit=10001 \
|
|
|
|
--filter=blob:limit=1001 >filter.pack <<-EOF &&
|
|
|
|
HEAD
|
|
|
|
EOF
|
|
|
|
git -C r2 index-pack ../filter.pack &&
|
|
|
|
|
|
|
|
git -C r2 verify-pack -v ../filter.pack >verify_result &&
|
|
|
|
grep blob verify_result |
|
|
|
|
parse_verify_pack_blob_oid |
|
|
|
|
sort >observed &&
|
|
|
|
|
|
|
|
test_cmp expected observed
|
|
|
|
'
|
|
|
|
|
2017-11-21 20:58:52 +00:00
|
|
|
# Test sparse:path=<path> filter.
|
2019-05-29 12:44:32 +00:00
|
|
|
# !!!!
|
|
|
|
# NOTE: sparse:path filter support has been dropped for security reasons,
|
|
|
|
# so the tests have been changed to make sure that using it fails.
|
|
|
|
# !!!!
|
2017-11-21 20:58:52 +00:00
|
|
|
# Use a local file containing a sparse-checkout specification to filter
|
|
|
|
# out blobs not required for the corresponding sparse-checkout. We do not
|
|
|
|
# require sparse-checkout to actually be enabled.
|
|
|
|
|
|
|
|
test_expect_success 'setup r3' '
|
|
|
|
git init r3 &&
|
|
|
|
mkdir r3/dir1 &&
|
|
|
|
for n in sparse1 sparse2
|
|
|
|
do
|
tests: fix broken &&-chains in compound statements
The top-level &&-chain checker built into t/test-lib.sh causes tests to
magically exit with code 117 if the &&-chain is broken. However, it has
the shortcoming that the magic does not work within `{...}` groups,
`(...)` subshells, `$(...)` substitutions, or within bodies of compound
statements, such as `if`, `for`, `while`, `case`, etc. `chainlint.sed`
partly fills in the gap by catching broken &&-chains in `(...)`
subshells, but bugs can still lurk behind broken &&-chains in the other
cases.
Fix broken &&-chains in compound statements in order to reduce the
number of possible lurking bugs.
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Reviewed-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2021-12-09 05:11:06 +00:00
|
|
|
echo "This is file: $n" > r3/$n &&
|
|
|
|
git -C r3 add $n &&
|
|
|
|
echo "This is file: dir1/$n" > r3/dir1/$n &&
|
2021-12-09 05:11:14 +00:00
|
|
|
git -C r3 add dir1/$n || return 1
|
2017-11-21 20:58:52 +00:00
|
|
|
done &&
|
|
|
|
git -C r3 commit -m "sparse" &&
|
|
|
|
echo dir1/ >pattern1 &&
|
|
|
|
echo sparse1 >pattern2
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'verify blob count in normal packfile' '
|
2022-11-29 12:21:17 +00:00
|
|
|
git -C r3 ls-files -s sparse1 sparse2 dir1/sparse1 dir1/sparse2 \
|
|
|
|
>ls_files_result &&
|
|
|
|
test_parse_ls_files_stage_oids <ls_files_result |
|
2018-10-05 21:54:03 +00:00
|
|
|
sort >expected &&
|
|
|
|
|
2019-03-25 18:14:23 +00:00
|
|
|
git -C r3 pack-objects --revs --stdout >all.pack <<-EOF &&
|
2017-11-21 20:58:52 +00:00
|
|
|
HEAD
|
|
|
|
EOF
|
|
|
|
git -C r3 index-pack ../all.pack &&
|
2018-10-05 21:54:03 +00:00
|
|
|
|
2018-10-05 21:54:05 +00:00
|
|
|
git -C r3 verify-pack -v ../all.pack >verify_result &&
|
|
|
|
grep blob verify_result |
|
2022-04-05 05:20:15 +00:00
|
|
|
parse_verify_pack_blob_oid |
|
2018-10-05 21:54:03 +00:00
|
|
|
sort >observed &&
|
|
|
|
|
2018-10-05 21:54:04 +00:00
|
|
|
test_cmp expected observed
|
2017-11-21 20:58:52 +00:00
|
|
|
'
|
|
|
|
|
2019-05-29 12:44:32 +00:00
|
|
|
test_expect_success 'verify sparse:path=pattern1 fails' '
|
|
|
|
test_must_fail git -C r3 pack-objects --revs --stdout \
|
|
|
|
--filter=sparse:path=../pattern1 <<-EOF
|
2017-11-21 20:58:52 +00:00
|
|
|
HEAD
|
|
|
|
EOF
|
|
|
|
'
|
|
|
|
|
2019-05-29 12:44:32 +00:00
|
|
|
test_expect_success 'verify sparse:path=pattern2 fails' '
|
|
|
|
test_must_fail git -C r3 pack-objects --revs --stdout \
|
|
|
|
--filter=sparse:path=../pattern2 <<-EOF
|
2017-11-21 20:58:52 +00:00
|
|
|
HEAD
|
|
|
|
EOF
|
|
|
|
'
|
|
|
|
|
|
|
|
# Test sparse:oid=<oid-ish> filter.
|
2019-05-29 12:44:32 +00:00
|
|
|
# Use a blob containing a sparse-checkout specification to filter
|
|
|
|
# out blobs not required for the corresponding sparse-checkout. We do not
|
|
|
|
# require sparse-checkout to actually be enabled.
|
2017-11-21 20:58:52 +00:00
|
|
|
|
|
|
|
test_expect_success 'setup r4' '
|
|
|
|
git init r4 &&
|
|
|
|
mkdir r4/dir1 &&
|
|
|
|
for n in sparse1 sparse2
|
|
|
|
do
|
tests: fix broken &&-chains in compound statements
The top-level &&-chain checker built into t/test-lib.sh causes tests to
magically exit with code 117 if the &&-chain is broken. However, it has
the shortcoming that the magic does not work within `{...}` groups,
`(...)` subshells, `$(...)` substitutions, or within bodies of compound
statements, such as `if`, `for`, `while`, `case`, etc. `chainlint.sed`
partly fills in the gap by catching broken &&-chains in `(...)`
subshells, but bugs can still lurk behind broken &&-chains in the other
cases.
Fix broken &&-chains in compound statements in order to reduce the
number of possible lurking bugs.
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Reviewed-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2021-12-09 05:11:06 +00:00
|
|
|
echo "This is file: $n" > r4/$n &&
|
|
|
|
git -C r4 add $n &&
|
|
|
|
echo "This is file: dir1/$n" > r4/dir1/$n &&
|
2021-12-09 05:11:14 +00:00
|
|
|
git -C r4 add dir1/$n || return 1
|
2017-11-21 20:58:52 +00:00
|
|
|
done &&
|
|
|
|
echo dir1/ >r4/pattern &&
|
|
|
|
git -C r4 add pattern &&
|
|
|
|
git -C r4 commit -m "pattern"
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'verify blob count in normal packfile' '
|
2022-11-29 12:21:17 +00:00
|
|
|
git -C r4 ls-files -s pattern sparse1 sparse2 dir1/sparse1 dir1/sparse2 \
|
|
|
|
>ls_files_result &&
|
|
|
|
test_parse_ls_files_stage_oids <ls_files_result |
|
2018-10-05 21:54:03 +00:00
|
|
|
sort >expected &&
|
|
|
|
|
2019-03-25 18:14:23 +00:00
|
|
|
git -C r4 pack-objects --revs --stdout >all.pack <<-EOF &&
|
2017-11-21 20:58:52 +00:00
|
|
|
HEAD
|
|
|
|
EOF
|
|
|
|
git -C r4 index-pack ../all.pack &&
|
2018-10-05 21:54:03 +00:00
|
|
|
|
2018-10-05 21:54:05 +00:00
|
|
|
git -C r4 verify-pack -v ../all.pack >verify_result &&
|
|
|
|
grep blob verify_result |
|
2022-04-05 05:20:15 +00:00
|
|
|
parse_verify_pack_blob_oid |
|
2018-10-05 21:54:03 +00:00
|
|
|
sort >observed &&
|
|
|
|
|
2018-10-05 21:54:04 +00:00
|
|
|
test_cmp expected observed
|
2017-11-21 20:58:52 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'verify sparse:oid=OID' '
|
2022-11-29 12:21:17 +00:00
|
|
|
git -C r4 ls-files -s dir1/sparse1 dir1/sparse2 >ls_files_result &&
|
|
|
|
test_parse_ls_files_stage_oids <ls_files_result |
|
2018-10-05 21:54:03 +00:00
|
|
|
sort >expected &&
|
|
|
|
|
2019-11-27 19:53:31 +00:00
|
|
|
git -C r4 ls-files -s pattern >staged &&
|
2022-04-05 05:20:15 +00:00
|
|
|
oid=$(test_parse_ls_files_stage_oids <staged) &&
|
2019-03-25 18:14:23 +00:00
|
|
|
git -C r4 pack-objects --revs --stdout --filter=sparse:oid=$oid >filter.pack <<-EOF &&
|
2017-11-21 20:58:52 +00:00
|
|
|
HEAD
|
|
|
|
EOF
|
|
|
|
git -C r4 index-pack ../filter.pack &&
|
2018-10-05 21:54:03 +00:00
|
|
|
|
2018-10-05 21:54:05 +00:00
|
|
|
git -C r4 verify-pack -v ../filter.pack >verify_result &&
|
|
|
|
grep blob verify_result |
|
2022-04-05 05:20:15 +00:00
|
|
|
parse_verify_pack_blob_oid |
|
2018-10-05 21:54:03 +00:00
|
|
|
sort >observed &&
|
|
|
|
|
2018-10-05 21:54:04 +00:00
|
|
|
test_cmp expected observed
|
2017-11-21 20:58:52 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'verify sparse:oid=oid-ish' '
|
2022-11-29 12:21:17 +00:00
|
|
|
git -C r4 ls-files -s dir1/sparse1 dir1/sparse2 >ls_files_result &&
|
|
|
|
test_parse_ls_files_stage_oids <ls_files_result |
|
2018-10-05 21:54:03 +00:00
|
|
|
sort >expected &&
|
|
|
|
|
2020-11-18 23:44:29 +00:00
|
|
|
git -C r4 pack-objects --revs --stdout --filter=sparse:oid=main:pattern >filter.pack <<-EOF &&
|
2017-11-21 20:58:52 +00:00
|
|
|
HEAD
|
|
|
|
EOF
|
|
|
|
git -C r4 index-pack ../filter.pack &&
|
2018-10-05 21:54:03 +00:00
|
|
|
|
2018-10-05 21:54:05 +00:00
|
|
|
git -C r4 verify-pack -v ../filter.pack >verify_result &&
|
|
|
|
grep blob verify_result |
|
2022-04-05 05:20:15 +00:00
|
|
|
parse_verify_pack_blob_oid |
|
2018-10-05 21:54:03 +00:00
|
|
|
sort >observed &&
|
|
|
|
|
2018-10-05 21:54:04 +00:00
|
|
|
test_cmp expected observed
|
2017-11-21 20:58:52 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
# Delete some loose objects and use pack-objects, but WITHOUT any filtering.
|
|
|
|
# This models previously omitted objects that we did not receive.
|
|
|
|
|
|
|
|
test_expect_success 'setup r1 - delete loose blobs' '
|
2022-11-29 12:21:17 +00:00
|
|
|
git -C r1 ls-files -s file.1 file.2 file.3 file.4 file.5 \
|
|
|
|
>ls_files_result &&
|
|
|
|
test_parse_ls_files_stage_oids <ls_files_result |
|
2018-10-05 21:54:03 +00:00
|
|
|
sort >expected &&
|
|
|
|
|
2017-11-21 20:58:52 +00:00
|
|
|
for id in `cat expected | sed "s|..|&/|"`
|
|
|
|
do
|
2021-12-09 05:11:14 +00:00
|
|
|
rm r1/.git/objects/$id || return 1
|
2017-11-21 20:58:52 +00:00
|
|
|
done
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'verify pack-objects fails w/ missing objects' '
|
2019-03-25 18:14:23 +00:00
|
|
|
test_must_fail git -C r1 pack-objects --revs --stdout >miss.pack <<-EOF
|
2017-11-21 20:58:52 +00:00
|
|
|
HEAD
|
|
|
|
EOF
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'verify pack-objects fails w/ --missing=error' '
|
2019-03-25 18:14:23 +00:00
|
|
|
test_must_fail git -C r1 pack-objects --revs --stdout --missing=error >miss.pack <<-EOF
|
2017-11-21 20:58:52 +00:00
|
|
|
HEAD
|
|
|
|
EOF
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'verify pack-objects w/ --missing=allow-any' '
|
2019-03-25 18:14:23 +00:00
|
|
|
git -C r1 pack-objects --revs --stdout --missing=allow-any >miss.pack <<-EOF
|
2017-11-21 20:58:52 +00:00
|
|
|
HEAD
|
|
|
|
EOF
|
|
|
|
'
|
|
|
|
|
|
|
|
test_done
|