summaryrefslogtreecommitdiff
path: root/t/t4014-format-patch.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-09-19 13:15:41 -0700
committerJunio C Hamano <gitster@pobox.com>2011-09-19 13:15:41 -0700
commit9b502a371e9bc340a537bb19d9a00750428e1651 (patch)
tree7a9cb72308c7238e01e33bda876a78550da48dc3 /t/t4014-format-patch.sh
parent167a5800cb707ed489c3cb88174ee21e95a610ae (diff)
parente810715528eda01914d2df82628872e8df9929d5 (diff)
downloadgit-9b502a371e9bc340a537bb19d9a00750428e1651.tar.gz
Merge branch 'ph/format-patch-no-color'
* ph/format-patch-no-color: t4014: clean up format.thread config after each test
Diffstat (limited to 't/t4014-format-patch.sh')
-rwxr-xr-xt/t4014-format-patch.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh
index 7e405d7af6..67975129bc 100755
--- a/t/t4014-format-patch.sh
+++ b/t/t4014-format-patch.sh
@@ -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
'