Merge branch 'sw/git-p4-unshelve-branched-files'

diff --git a/t/t1050-large.sh b/t/t1050-large.sh
index 1a9b21b2934b0a4fae7f74bb8c4da65d32218ca0..dcb4dbba673eb2eb6e13117babb6b75e8e59a49a 100755 (executable)
--- a/t/t1050-large.sh
+++ b/t/t1050-large.sh
@@ -8,7 +8,7 @@ test_description='adding and checking out large blobs'
 # This should be moved to test-lib.sh together with the
 # copy in t0021 after both topics have graduated to 'master'.
 file_size () {
-       perl -e 'print -s $ARGV[0]' "$1"
+       test-tool path-utils file-size "$1"
 }
 
 test_expect_success setup '