t6423: fix test setup for a couple tests
Commit da1e295e00 ("t604[236]: do not run setup in separate tests", 2019-10-22) removed approximately half the tests (which were setup-only tests) in t6043 by turning them into functions that the subsequent test would call as their first step. This ensured that any test from this file could be run entirely independently of all the other tests in the file. Unfortunately, the call to the new setup function was missed in two of the test_expect_failure cases. Add them in. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Elijah Newren committed
Aug 10, 2020 at 22:29 UTC
a0601b2eb3213d125b1e9b40215e9ba4959af6e9
1 file changed
+2
t/t6423-merge-rename-directories.sh
+2
@@ -2880,6 +2880,7 @@ test_setup_9g () {
2880
}
2881
2882
test_expect_failure '9g: Renamed directory that only contained immediate subdirs, immediate subdirs renamed' '
2883
+ test_setup_9g &&
2884
(
2885
cd 9g &&
2886
@@ -3362,6 +3363,7 @@ test_setup_10e () {
3363
}
3364
3365
test_expect_failure '10e: Does git complain about untracked file that is not really in the way?' '
3366
+ test_setup_10e &&
3367
(
3368
cd 10e &&
3369