From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 9 Sep 2019 19:26:40 +0000 (-0700)
Subject: Merge branch 'tg/t0021-racefix'
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/8f3ba423e7149fdbe1d7e1d2f245b4c0a2a1bdfb?hp=a477abe9e4bdf1dd3627c20b69ed8b51f27c2f81

Merge branch 'tg/t0021-racefix'

A test fix.

* tg/t0021-racefix:
t0021: make sure clean filter runs
---

diff --git a/t/t0021-conversion.sh b/t/t0021-conversion.sh
index e10f5f787f..c954c709ad 100755
--- a/t/t0021-conversion.sh
+++ b/t/t0021-conversion.sh
@@ -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