t5319: use 'test-tool path-utils' instead of 'ls -l'
Using 'ls -l' and parsing the columns to find file sizes is problematic when the platform could report the owner as a name with spaces. Instead, use the 'test-tool path-utils file-size' command to list only the sizes. Reported-by: Johannes Sixt <j6t@kdbg.org> Helped-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Derrick Stolee committed
Jul 1, 2019 at 06:16 UTC
3612c2334af8b70137a2d3f5497b1b6f4e9762a2
1 file changed
+2
-2
t/t5319-multi-pack-index.sh
+2
-2
@@ -443,7 +443,7 @@ test_expect_success 'repack with minimum size does not alter existing packs' '
443
touch -m -t 201901010002 .git/objects/pack/pack-B* &&
444
touch -m -t 201901010003 .git/objects/pack/pack-A* &&
445
ls .git/objects/pack >expect &&
446
- MINSIZE=$(ls -l .git/objects/pack/*pack | awk "{print \$5;}" | sort -n | head -n 1) &&
446
+ MINSIZE=$(test-tool path-utils file-size .git/objects/pack/*pack | sort -n | head -n 1) &&
447
git multi-pack-index repack --batch-size=$MINSIZE &&
448
ls .git/objects/pack >actual &&
449
test_cmp expect actual
@@ -455,7 +455,7 @@ test_expect_success 'repack creates a new pack' '
455
cd dup &&
456
ls .git/objects/pack/*idx >idx-list &&
457
test_line_count = 5 idx-list &&
458
- THIRD_SMALLEST_SIZE=$(ls -l .git/objects/pack/*pack | awk "{print \$5;}" | sort -n | head -n 3 | tail -n 1) &&
458
+ THIRD_SMALLEST_SIZE=$(test-tool path-utils file-size .git/objects/pack/*pack | sort -n | head -n 3 | tail -n 1) &&
459
BATCH_SIZE=$(($THIRD_SMALLEST_SIZE + 1)) &&
460
git multi-pack-index repack --batch-size=$BATCH_SIZE &&
461
ls .git/objects/pack/*idx >idx-list &&