t1006: prefer shell loop to awk for packed object sizes

To compute the expected on-disk size of packed objects, we sort the output of show-index by pack offset and then compute the difference between adjacent entries using awk. This works but has a few readability problems: 1. Reading the index in pack order means don't find out the size of an oid's entry until we see the _next_ entry. So we have to save it to print later. We can instead iterate in reverse order, so we compute each oid's size as we see it. 2. Since the awk invocation is inside a text_expect block, we can't easily use single-quotes to hold the script. So we use double-quotes, but then have to escape the dollar signs in the awk script. We can swap this out for a shell loop instead (which is made much easier by the first change). Signed-off-by: René Scharfe <l.s.r@web.de> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

René Scharfe committed Jan 3, 2024 at 04:01 UTC 54d8a2531b839bb9c4e2f5aa26aae029415211f9
1 file changed +8 -6
t/t1006-cat-file.sh
+8 -6
@@ -1117,14 +1117,16 @@ test_expect_success 'cat-file %(objectsize:disk) with --batch-all-objects' '
1117 while read idx
1118 do
1119 git show-index <"$idx" >idx.raw &&
1120 - sort -n <idx.raw >idx.sorted &&
1120 + sort -nr <idx.raw >idx.sorted &&
1121 packsz=$(test_file_size "${idx%.idx}.pack") &&
1122 end=$((packsz - rawsz)) &&
1123 - awk -v end="$end" "
1124 - NR > 1 { print oid, \$1 - start }
1125 - { start = \$1; oid = \$2 }
1126 - END { print oid, end - start }
1127 - " idx.sorted ||
1123 + while read start oid rest
1124 + do
1125 + size=$((end - start)) &&
1126 + end=$start &&
1127 + echo "$oid $size" ||
1128 + return 1
1129 + done <idx.sorted ||
1130 return 1
1131 done
1132 } >expect.raw &&