diff options
author | Junio C Hamano <gitster@pobox.com> | 2020-07-07 05:09:13 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-07-07 05:09:13 (GMT) |
commit | 12210859da0c16c644dab658d9e1ef671ec28788 (patch) | |
tree | e8035e6e8412b45972e8836399f531c6379313f8 /t/t1050-large.sh | |
parent | a08a83db2bf27f015bec9a435f6d73e223c21c5e (diff) | |
parent | 3716d50dd5c8ee7e5ccaa89fcbfff2cd1b82ad1d (diff) | |
download | git-12210859da0c16c644dab658d9e1ef671ec28788.zip git-12210859da0c16c644dab658d9e1ef671ec28788.tar.gz git-12210859da0c16c644dab658d9e1ef671ec28788.tar.bz2 |
Merge branch 'bc/sha-256-part-2'
SHA-256 migration work continues.
* bc/sha-256-part-2: (44 commits)
remote-testgit: adapt for object-format
bundle: detect hash algorithm when reading refs
t5300: pass --object-format to git index-pack
t5704: send object-format capability with SHA-256
t5703: use object-format serve option
t5702: offer an object-format capability in the test
t/helper: initialize the repository for test-sha1-array
remote-curl: avoid truncating refs with ls-remote
t1050: pass algorithm to index-pack when outside repo
builtin/index-pack: add option to specify hash algorithm
remote-curl: detect algorithm for dumb HTTP by size
builtin/ls-remote: initialize repository based on fetch
t5500: make hash independent
serve: advertise object-format capability for protocol v2
connect: parse v2 refs with correct hash algorithm
connect: pass full packet reader when parsing v2 refs
Documentation/technical: document object-format for protocol v2
t1302: expect repo format version 1 for SHA-256
builtin/show-index: provide options to determine hash algo
t5302: modernize test formatting
...
Diffstat (limited to 't/t1050-large.sh')
-rwxr-xr-x | t/t1050-large.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/t/t1050-large.sh b/t/t1050-large.sh index 184b479..6a56d1c 100755 --- a/t/t1050-large.sh +++ b/t/t1050-large.sh @@ -12,6 +12,7 @@ file_size () { } test_expect_success setup ' + test_oid_init && # clone does not allow us to pass core.bigfilethreshold to # new repos, so set core.bigfilethreshold globally git config --global core.bigfilethreshold 200k && @@ -64,7 +65,7 @@ test_expect_success 'add a large file or two' ' test $count = 1 && cnt=$(git show-index <"$idx" | wc -l) && test $cnt = 2 && - for l in .git/objects/??/?????????????????????????????????????? + for l in .git/objects/$OIDPATH_REGEX do test_path_is_file "$l" || continue bad=t @@ -177,7 +178,8 @@ test_expect_success 'git-show a large file' ' test_expect_success 'index-pack' ' git clone file://"$(pwd)"/.git foo && - GIT_DIR=non-existent git index-pack --strict --verify foo/.git/objects/pack/*.pack + GIT_DIR=non-existent git index-pack --object-format=$(test_oid algo) \ + --strict --verify foo/.git/objects/pack/*.pack ' test_expect_success 'repack' ' |