On 08/11/17 22:34, Ramsay Jones wrote:
>
>
> On 08/11/17 20:36, Stefan Beller wrote:
>> On Wed, Nov 8, 2017 at 12:28 PM, Ramsay Jones
>> <ram...@ramsayjones.plus.com> wrote:
>>
>>> t5300-pack-object.sh (Wstat: 256 Tests: 40
>>> Failed: 2)
>>
>>> t5500-fetch-pack.sh (Wstat: 256 Tests: 355
>>> Failed: 6)
>>
>> These are series
>>
>>> t5601-clone.sh (Wstat: 256 Tests: 102
>>> Failed: 4)
>>
>> This one is a spurious test. I had that flake on me once in the last weeks,
>> too.
>> But upon investigation I could not reproduce.
>> See
>> https://public-inbox.org/git/xmqq376ipdpx....@gitster.mtv.corp.google.com/
>>
>
> No, this is not related to that. In fact several tests start
> working if I change the '--filter=blobs:limit=0' to instead
> read '--filter=blob:limit=0' (ie. change blob_s_ to blob).
>
> In fact t5601 now works with the following patch:
OK, so the patch given below fixes all tests except t5300.37.
All the patch does is change 'blobs' to 'blob' in the --filter
parameters.
The single failure looks like:
$ ./t5300-pack-object.sh -i -v
...
Initialized empty Git repository in /home/ramsay/git/t/trash
directory.t5300-pack-object/server/.git/
[master (root-commit) a72904c] x
Author: A U Thor <aut...@example.com>
3 files changed, 3 insertions(+)
create mode 100644 .git-a
create mode 100644 a
create mode 100644 b
Counting objects: 2, done.
Compressing objects: 100% (2/2), done.
Total 2 (delta 0), reused 0 (delta 0)
ad26794874784493dafa81f1644b3dcfad05d843
not ok 37 - filtering by size never excludes special files
#
# rm -rf server &&
# git init server &&
# printf a-very-long-file > server/a &&
# printf a-very-long-file > server/.git-a &&
# printf b-very-long-file > server/b &&
# git -C server add a .git-a b &&
# git -C server commit -m x &&
#
# git -C server rev-parse HEAD >objects &&
# git -C server pack-objects --revs --stdout
--filter=blob:limit=10 <objects >my.pack &&
#
# # Ensure that the .git-a blob is in the packfile, despite also
# # appearing as a non-.git file
# git index-pack my.pack &&
# git verify-pack -v my.idx >objectlist &&
# grep $(git hash-object server/a) objectlist
#
$
Hope that helps.
ATB,
Ramsay Jones
-- >8 --
diff --git a/t/t5300-pack-object.sh b/t/t5300-pack-object.sh
index 0739a0796..17c9ffdca 100755
--- a/t/t5300-pack-object.sh
+++ b/t/t5300-pack-object.sh
@@ -472,7 +472,7 @@ test_expect_success 'filtering by size works with multiple
excluded' '
git -C server commit -m x &&
git -C server rev-parse HEAD >objects &&
- git -C server pack-objects --revs --stdout --filter=blobs:limit=10
<objects >my.pack &&
+ git -C server pack-objects --revs --stdout --filter=blob:limit=10
<objects >my.pack &&
# Ensure that only the small blobs are in the packfile
git index-pack my.pack &&
@@ -493,7 +493,7 @@ test_expect_success 'filtering by size never excludes
special files' '
git -C server commit -m x &&
git -C server rev-parse HEAD >objects &&
- git -C server pack-objects --revs --stdout --filter=blobs:limit=10
<objects >my.pack &&
+ git -C server pack-objects --revs --stdout --filter=blob:limit=10
<objects >my.pack &&
# Ensure that the .git-a blob is in the packfile, despite also
# appearing as a non-.git file
diff --git a/t/t5500-fetch-pack.sh b/t/t5500-fetch-pack.sh
index 86cf65323..08b7a32c7 100755
--- a/t/t5500-fetch-pack.sh
+++ b/t/t5500-fetch-pack.sh
@@ -762,7 +762,7 @@ test_expect_success 'filtering by size' '
test_config -C server uploadpack.allowfilter 1 &&
test_create_repo client &&
- git -C client fetch-pack --filter=blobs:limit=0 ../server HEAD &&
+ git -C client fetch-pack --filter=blob:limit=0 ../server HEAD &&
# Ensure that object is not inadvertently fetched
test_must_fail git -C client cat-file -e $(git hash-object server/one.t)
@@ -774,7 +774,7 @@ test_expect_success 'filtering by size has no effect if
support for it is not ad
test_commit -C server one &&
test_create_repo client &&
- git -C client fetch-pack --filter=blobs:limit=0 ../server HEAD 2> err &&
+ git -C client fetch-pack --filter=blob:limit=0 ../server HEAD 2> err &&
# Ensure that object is fetched
git -C client cat-file -e $(git hash-object server/one.t) &&
@@ -800,7 +800,7 @@ setup_blob_max_bytes () {
do_blob_max_bytes() {
SERVER="$1" &&
- git -C client fetch --filter=blobs:limit=0 origin HEAD:somewhere &&
+ git -C client fetch --filter=blob:limit=0 origin HEAD:somewhere &&
# Ensure that commit is fetched, but blob is not
test_config -C client extensions.partialcloneremote "arbitrary string"
&&
@@ -816,7 +816,7 @@ test_expect_success 'fetch with filtering' '
test_expect_success 'fetch respects configured filtering' '
setup_blob_max_bytes server server &&
- test_config -C client extensions.partialclonefilter blobs:limit=0 &&
+ test_config -C client extensions.partialclonefilter blob:limit=0 &&
git -C client fetch origin HEAD:somewhere &&
@@ -835,7 +835,7 @@ test_expect_success 'pull respects configured filtering' '
test_commit -C server three &&
test_config -C server uploadpack.allowanysha1inwant 1 &&
- test_config -C client extensions.partialclonefilter blobs:limit=0 &&
+ test_config -C client extensions.partialclonefilter blob:limit=0 &&
git -C client pull origin &&
@@ -852,7 +852,7 @@ test_expect_success 'clone configures filtering' '
test_commit -C server two &&
test_config -C server uploadpack.allowanysha1inwant 1 &&
- git clone --filter=blobs:limit=12345 server client &&
+ git clone --filter=blob:limit=12345 server client &&
# Ensure that we can, for example, checkout HEAD^
rm -rf client/.git/objects/* &&
diff --git a/t/t5601-clone.sh b/t/t5601-clone.sh
index f18d9454a..0074690f7 100755
--- a/t/t5601-clone.sh
+++ b/t/t5601-clone.sh
@@ -630,7 +630,7 @@ partial_clone () {
test_config -C "$SERVER" uploadpack.allowfilter 1 &&
test_config -C "$SERVER" uploadpack.allowanysha1inwant 1 &&
- git clone --filter=blobs:limit=0 "$URL" client &&
+ git clone --filter=blob:limit=0 "$URL" client &&
git -C client fsck &&
@@ -651,7 +651,7 @@ test_expect_success 'partial clone: warn if server does not
support object filte
test_create_repo server &&
test_commit -C server one &&
- git clone --filter=blobs:limit=0 "file://$(pwd)/server" client 2> err &&
+ git clone --filter=blob:limit=0 "file://$(pwd)/server" client 2> err &&
test_i18ngrep "filtering not recognized by server" err
'
@@ -673,7 +673,7 @@ test_expect_success 'batch missing blob request during
checkout' '
test_config -C server uploadpack.allowfilter 1 &&
test_config -C server uploadpack.allowanysha1inwant 1 &&
- git clone --filter=blobs:limit=0 "file://$(pwd)/server" client &&
+ git clone --filter=blob:limit=0 "file://$(pwd)/server" client &&
# Ensure that there is only one negotiation by checking that there is
# only "done" line sent. ("done" marks the end of negotiation.)
@@ -705,7 +705,7 @@ test_expect_success 'batch missing blob request does not
inadvertently try to fe
test_config -C server uploadpack.allowanysha1inwant 1 &&
# Make sure that it succeeds
- git clone --filter=blobs:limit=0 "file://$(pwd)/server" client
+ git clone --filter=blob:limit=0 "file://$(pwd)/server" client
'
. "$TEST_DIRECTORY"/lib-httpd.sh
-- 8< --
