commit 8f3ba423e7149fdbe1d7e1d2f245b4c0a2a1bdfb
author Junio C Hamano <gitster@pobox.com> Mon Sep 09 12:26:40 2019 -0700
committer Junio C Hamano <gitster@pobox.com> Mon Sep 09 12:26:40 2019 -0700
tree f2804f3b3d35f038367686341a809b7346ddfc7c
parent a477abe9e4bdf1dd3627c20b69ed8b51f27c2f81
parent 58166c2e9d9a3bbf6eee9e3e8710d92985e6edab

Merge branch 'tg/t0021-racefix'

A test fix.

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

t/t0021-conversion.sh

diff --git a/t/t0021-conversion.sh b/t/t0021-conversion.sh
index e10f5f7..c954c70 100755
--- a/t/t0021-conversion.sh
+++ b/t/t0021-conversion.sh
@@ -390,6 +390,9 @@
 		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