t1006: make hash size independent
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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
brian m. carlson committed
Sep 13, 2018 at 05:17 UTC
e95f53137d2d920cc42d3422d21845edbc49d9cc
1 file changed
+4
-2
t/t1006-cat-file.sh
+4
-2
@@ -140,15 +140,17 @@ test_expect_success '--batch-check without %(rest) considers whole line' '
140
test_cmp expect actual
141
'
142
143
+test_oid_init
144
+
145
tree_sha1=$(git write-tree)
144
-tree_size=33
146
+tree_size=$(($(test_oid rawsz) + 13))
147
tree_pretty_content="100644 blob $hello_sha1 hello"
148
149
run_tests 'tree' $tree_sha1 $tree_size "" "$tree_pretty_content"
150
151
commit_message="Initial commit"
152
commit_sha1=$(echo_without_newline "$commit_message" | git commit-tree $tree_sha1)
151
-commit_size=177
153
+commit_size=$(($(test_oid hexsz) + 137))
154
commit_content="tree $tree_sha1
155
author $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> 0000000000 +0000
156
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 0000000000 +0000