mirror of
https://github.com/git/git
synced 2024-09-13 21:34:42 +00:00
Merge branch 'rs/t6300-compressed-size-fix' into maint-2.43
Test fix. * rs/t6300-compressed-size-fix: t6300: avoid hard-coding object sizes
This commit is contained in:
commit
f5fa75af53
|
@ -20,12 +20,13 @@ setdate_and_increment () {
|
||||||
export GIT_COMMITTER_DATE GIT_AUTHOR_DATE
|
export GIT_COMMITTER_DATE GIT_AUTHOR_DATE
|
||||||
}
|
}
|
||||||
|
|
||||||
test_expect_success setup '
|
test_object_file_size () {
|
||||||
test_oid_cache <<-EOF &&
|
oid=$(git rev-parse "$1")
|
||||||
disklen sha1:138
|
path=".git/objects/$(test_oid_to_path $oid)"
|
||||||
disklen sha256:154
|
test_file_size "$path"
|
||||||
EOF
|
}
|
||||||
|
|
||||||
|
test_expect_success setup '
|
||||||
# setup .mailmap
|
# setup .mailmap
|
||||||
cat >.mailmap <<-EOF &&
|
cat >.mailmap <<-EOF &&
|
||||||
A Thor <athor@example.com> A U Thor <author@example.com>
|
A Thor <athor@example.com> A U Thor <author@example.com>
|
||||||
|
@ -94,7 +95,6 @@ test_atom () {
|
||||||
}
|
}
|
||||||
|
|
||||||
hexlen=$(test_oid hexsz)
|
hexlen=$(test_oid hexsz)
|
||||||
disklen=$(test_oid disklen)
|
|
||||||
|
|
||||||
test_atom head refname refs/heads/main
|
test_atom head refname refs/heads/main
|
||||||
test_atom head refname: refs/heads/main
|
test_atom head refname: refs/heads/main
|
||||||
|
@ -129,7 +129,7 @@ test_atom head push:strip=1 remotes/myfork/main
|
||||||
test_atom head push:strip=-1 main
|
test_atom head push:strip=-1 main
|
||||||
test_atom head objecttype commit
|
test_atom head objecttype commit
|
||||||
test_atom head objectsize $((131 + hexlen))
|
test_atom head objectsize $((131 + hexlen))
|
||||||
test_atom head objectsize:disk $disklen
|
test_atom head objectsize:disk $(test_object_file_size refs/heads/main)
|
||||||
test_atom head deltabase $ZERO_OID
|
test_atom head deltabase $ZERO_OID
|
||||||
test_atom head objectname $(git rev-parse refs/heads/main)
|
test_atom head objectname $(git rev-parse refs/heads/main)
|
||||||
test_atom head objectname:short $(git rev-parse --short refs/heads/main)
|
test_atom head objectname:short $(git rev-parse --short refs/heads/main)
|
||||||
|
@ -203,8 +203,8 @@ test_atom tag upstream ''
|
||||||
test_atom tag push ''
|
test_atom tag push ''
|
||||||
test_atom tag objecttype tag
|
test_atom tag objecttype tag
|
||||||
test_atom tag objectsize $((114 + hexlen))
|
test_atom tag objectsize $((114 + hexlen))
|
||||||
test_atom tag objectsize:disk $disklen
|
test_atom tag objectsize:disk $(test_object_file_size refs/tags/testtag)
|
||||||
test_atom tag '*objectsize:disk' $disklen
|
test_atom tag '*objectsize:disk' $(test_object_file_size refs/heads/main)
|
||||||
test_atom tag deltabase $ZERO_OID
|
test_atom tag deltabase $ZERO_OID
|
||||||
test_atom tag '*deltabase' $ZERO_OID
|
test_atom tag '*deltabase' $ZERO_OID
|
||||||
test_atom tag objectname $(git rev-parse refs/tags/testtag)
|
test_atom tag objectname $(git rev-parse refs/tags/testtag)
|
||||||
|
|
Loading…
Reference in a new issue