Skip to content

Commit 9b502a3

Browse files
committed
Merge branch 'ph/format-patch-no-color'
* ph/format-patch-no-color: t4014: clean up format.thread config after each test
2 parents 167a580 + e810715 commit 9b502a3

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
@@ -457,22 +457,22 @@ test_expect_success 'thread deep cover-letter in-reply-to' '
457457
'
458458

459459
test_expect_success 'thread via config' '
460-
git config format.thread true &&
460+
test_config format.thread true &&
461461
check_threading expect.thread master
462462
'
463463

464464
test_expect_success 'thread deep via config' '
465-
git config format.thread deep &&
465+
test_config format.thread deep &&
466466
check_threading expect.deep master
467467
'
468468

469469
test_expect_success 'thread config + override' '
470-
git config format.thread deep &&
470+
test_config format.thread deep &&
471471
check_threading expect.thread --thread master
472472
'
473473

474474
test_expect_success 'thread config + --no-thread' '
475-
git config format.thread deep &&
475+
test_config format.thread deep &&
476476
check_threading expect.no-threading --no-thread master
477477
'
478478

0 commit comments

Comments
 (0)