From: "brian m. carlson" <sandals@crustytoothpaste.net>
To: git@vger.kernel.org
Cc: "Jeff King" <peff@peff.net>,
"Eric Sunshine" <sunshine@sunshineco.com>,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>,
"Torsten Bögershausen" <tboegi@web.de>,
"Derrick Stolee" <stolee@gmail.com>,
"Junio C Hamano" <gitster@pobox.com>
Subject: [PATCH v4 07/12] t1006: make hash size independent
Date: Mon, 3 Sep 2018 23:25:10 +0000 [thread overview]
Message-ID: <20180903232515.336397-8-sandals@crustytoothpaste.net> (raw)
In-Reply-To: <20180903232515.336397-1-sandals@crustytoothpaste.net>
Compute the size of the tree and commit objects we're creating by
checking for the size of an object ID and computing the resulting sizes
accordingly.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
---
t/t1006-cat-file.sh | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/t/t1006-cat-file.sh b/t/t1006-cat-file.sh
index 7f19d591f2..a7c95bb785 100755
--- a/t/t1006-cat-file.sh
+++ b/t/t1006-cat-file.sh
@@ -140,15 +140,17 @@ test_expect_success '--batch-check without %(rest) considers whole line' '
test_cmp expect actual
'
+test_oid_init
+
tree_sha1=$(git write-tree)
-tree_size=33
+tree_size=$(($(test_oid rawsz) + 13))
tree_pretty_content="100644 blob $hello_sha1 hello"
run_tests 'tree' $tree_sha1 $tree_size "" "$tree_pretty_content"
commit_message="Initial commit"
commit_sha1=$(echo_without_newline "$commit_message" | git commit-tree $tree_sha1)
-commit_size=177
+commit_size=$(($(test_oid hexsz) + 137))
commit_content="tree $tree_sha1
author $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> 0000000000 +0000
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 0000000000 +0000
next prev parent reply other threads:[~2018-09-03 23:25 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-03 23:25 [PATCH v4 00/12] Hash-independent tests (part 3) brian m. carlson
2018-09-03 23:25 ` [PATCH v4 01/12] t: add test functions to translate hash-related values brian m. carlson
2018-09-04 0:01 ` Eric Sunshine
2018-09-05 22:50 ` brian m. carlson
2018-09-03 23:25 ` [PATCH v4 02/12] t0000: use hash translation table brian m. carlson
2018-09-03 23:25 ` [PATCH v4 03/12] t0000: update tests for SHA-256 brian m. carlson
2018-09-03 23:25 ` [PATCH v4 04/12] t0002: abstract away SHA-1 specific constants brian m. carlson
2018-09-03 23:25 ` [PATCH v4 05/12] t0027: make hash size independent brian m. carlson
2018-09-03 23:25 ` [PATCH v4 06/12] t0064: " brian m. carlson
2018-09-03 23:25 ` brian m. carlson [this message]
2018-09-03 23:25 ` [PATCH v4 08/12] t1400: switch hard-coded object ID to variable brian m. carlson
2018-09-03 23:25 ` [PATCH v4 09/12] t1405: make hash size independent brian m. carlson
2018-09-03 23:25 ` [PATCH v4 10/12] t1406: make hash-size independent brian m. carlson
2018-09-03 23:25 ` [PATCH v4 11/12] t1407: make hash size independent brian m. carlson
2018-09-03 23:25 ` [PATCH v4 12/12] t5318: use test_oid for HASH_LEN brian m. carlson
2018-09-04 12:36 ` Derrick Stolee
2018-09-04 16:22 ` [PATCH v4 00/12] Hash-independent tests (part 3) Duy Nguyen
2018-09-04 19:36 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180903232515.336397-8-sandals@crustytoothpaste.net \
--to=sandals@crustytoothpaste.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pclouds@gmail.com \
--cc=peff@peff.net \
--cc=stolee@gmail.com \
--cc=sunshine@sunshineco.com \
--cc=tboegi@web.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).