diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-09-19 20:15:41 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-09-19 20:15:41 (GMT) |
| commit | 9b502a371e9bc340a537bb19d9a00750428e1651 (patch) | |
| tree | 7a9cb72308c7238e01e33bda876a78550da48dc3 | |
| parent | 167a5800cb707ed489c3cb88174ee21e95a610ae (diff) | |
| parent | e810715528eda01914d2df82628872e8df9929d5 (diff) | |
| download | git-9b502a371e9bc340a537bb19d9a00750428e1651.zip git-9b502a371e9bc340a537bb19d9a00750428e1651.tar.gz git-9b502a371e9bc340a537bb19d9a00750428e1651.tar.bz2 | |
Merge branch 'ph/format-patch-no-color'
* ph/format-patch-no-color:
t4014: clean up format.thread config after each test
| -rwxr-xr-x | t/t4014-format-patch.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh index 7e405d7..6797512 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 ' |