t9301: make hash size independent
Instead of using a hard-coded all-zeros object ID, use $ZERO_OID. Compute the length of the object IDs in use and use this instead of hard-coding the constant 40. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Reviewed-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
brian m. carlson committed
Jul 29, 2020 at 23:14 UTC
b6e50052ac60254f423762e8a4f6192400130455
1 file changed
+6
-6
t/t9301-fast-import-notes.sh
+6
-6
@@ -470,12 +470,13 @@ test_expect_success 'add lots of commits and notes' '
470
'
471
472
test_expect_success 'verify that lots of notes trigger a fanout scheme' '
473
+ hexsz=$(test_oid hexsz) &&
474
475
# None of the entries in the top-level notes tree should be a full SHA1
476
git ls-tree --name-only refs/notes/many_notes |
477
while read path
478
do
478
- if test $(expr length "$path") -ge 40
479
+ if test $(expr length "$path") -ge $hexsz
480
then
481
return 1
482
fi
@@ -518,7 +519,7 @@ test_expect_success 'verify that importing a notes tree respects the fanout sche
519
git ls-tree --name-only refs/notes/other_notes |
520
while read path
521
do
521
- if test $(expr length "$path") -ge 40
522
+ if test $(expr length "$path") -ge $hexsz
523
then
524
return 1
525
fi
@@ -593,7 +594,7 @@ test_expect_success 'verify that changing notes respect existing fanout' '
594
git ls-tree --name-only refs/notes/many_notes |
595
while read path
596
do
596
- if test $(expr length "$path") -ge 40
597
+ if test $(expr length "$path") -ge $hexsz
598
then
599
return 1
600
fi
@@ -616,7 +617,7 @@ i=$(($num_commits - $remaining_notes))
617
for sha1 in $(git rev-list -n $i refs/heads/many_commits)
618
do
619
cat >>input <<INPUT_END
619
-N 0000000000000000000000000000000000000000 $sha1
620
+N $ZERO_OID $sha1
621
INPUT_END
622
done
623
@@ -646,7 +647,6 @@ test_expect_success 'remove lots of notes' '
647
'
648
649
test_expect_success 'verify that removing notes trigger fanout consolidation' '
649
-
650
# All entries in the top-level notes tree should be a full SHA1
651
git ls-tree --name-only -r refs/notes/many_notes |
652
while read path
@@ -656,7 +656,7 @@ test_expect_success 'verify that removing notes trigger fanout consolidation' '
656
test "$path" = "deadbeef" && continue
657
test "$path" = "de/adbeef" && continue
658
659
- if test $(expr length "$path") -ne 40
659
+ if test $(expr length "$path") -ne $hexsz
660
then
661
return 1
662
fi