Skip to content

Commit

Permalink
Merge branch 'ph/format-patch-no-color'
Browse files Browse the repository at this point in the history
* ph/format-patch-no-color:
  t4014: clean up format.thread config after each test
  • Loading branch information
Junio C Hamano committed Sep 19, 2011
2 parents 167a580 + e810715 commit 9b502a3
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions t/t4014-format-patch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -457,22 +457,22 @@ test_expect_success 'thread deep cover-letter in-reply-to' '
'

test_expect_success 'thread via config' '
git config format.thread true &&
test_config format.thread true &&
check_threading expect.thread master
'

test_expect_success 'thread deep via config' '
git config format.thread deep &&
test_config format.thread deep &&
check_threading expect.deep master
'

test_expect_success 'thread config + override' '
git config format.thread deep &&
test_config format.thread deep &&
check_threading expect.thread --thread master
'

test_expect_success 'thread config + --no-thread' '
git config format.thread deep &&
test_config format.thread deep &&
check_threading expect.no-threading --no-thread master
'

Expand Down

0 comments on commit 9b502a3

Please sign in to comment.