Skip to content

Commit e810715

Browse files
peffgitster
authored andcommitted
t4014: clean up format.thread config after each test
The threading tests turn on format.thread, but never clean up after themselves, meaning that later tests will also have format.thread set. This is more annoying than most leftover config, too, because not only does it impact the results of other tests, but it does so non-deterministically. Threading requires the generation of message-ids, which incorporate the current time, meaning a slow-running test script may generate different results from run to run. Signed-off-by: Jeff King <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 787570c commit e810715

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

t/t4014-format-patch.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -445,22 +445,22 @@ test_expect_success 'thread deep cover-letter in-reply-to' '
445445
'
446446

447447
test_expect_success 'thread via config' '
448-
git config format.thread true &&
448+
test_config format.thread true &&
449449
check_threading expect.thread master
450450
'
451451

452452
test_expect_success 'thread deep via config' '
453-
git config format.thread deep &&
453+
test_config format.thread deep &&
454454
check_threading expect.deep master
455455
'
456456

457457
test_expect_success 'thread config + override' '
458-
git config format.thread deep &&
458+
test_config format.thread deep &&
459459
check_threading expect.thread --thread master
460460
'
461461

462462
test_expect_success 'thread config + --no-thread' '
463-
git config format.thread deep &&
463+
test_config format.thread deep &&
464464
check_threading expect.no-threading --no-thread master
465465
'
466466

0 commit comments

Comments
 (0)