Merge branch 'en/merge-options-ff-and-friends'

diff --git a/t/t0021-conversion.sh b/t/t0021-conversion.sh
index fd5f1ac649dc411bf3c70dcb54f7965e4006aca8..c954c709ad2f50dac563cf237f7d485a2d41b7aa 100755 (executable)
--- a/t/t0021-conversion.sh
+++ b/t/t0021-conversion.sh
@@ -24,7 +24,7 @@ generate_random_characters () {
 }
 
 file_size () {
-       perl -e 'print -s $ARGV[0]' "$1"
+       test-tool path-utils file-size "$1"
 }
 
 filter_git () {
@@ -390,6 +390,9 @@ test_expect_success PERL 'required process filter should filter data' '
                EOF
                test_cmp_exclude_clean expected.log debug.log &&
 
+               # Make sure that the file appears dirty, so checkout below has to
+               # run the configured filter.
+               touch test.r &&
                filter_git checkout --quiet --no-progress empty-branch &&
                cat >expected.log <<-EOF &&
                        START