Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-09-09 22:26:40 +0300
committerJunio C Hamano <gitster@pobox.com>2019-09-09 22:26:40 +0300
commit8f3ba423e7149fdbe1d7e1d2f245b4c0a2a1bdfb (patch)
treef2804f3b3d35f038367686341a809b7346ddfc7c
parenta477abe9e4bdf1dd3627c20b69ed8b51f27c2f81 (diff)
parent58166c2e9d9a3bbf6eee9e3e8710d92985e6edab (diff)
Merge branch 'tg/t0021-racefix'
A test fix. * tg/t0021-racefix: t0021: make sure clean filter runs
-rwxr-xr-xt/t0021-conversion.sh3
1 files changed, 3 insertions, 0 deletions
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