diff options
| author | Jeff King <peff@peff.net> | 2011-09-19 15:15:45 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-09-19 13:14:32 -0700 |
| commit | e810715528eda01914d2df82628872e8df9929d5 (patch) | |
| tree | 66eb2015ee550fce10ac374ca1fd129e3704a16e | |
| parent | 787570c7cddea7ffe3cb2e52c8af169bb17ba29b (diff) | |
| download | git-e810715528eda01914d2df82628872e8df9929d5.tar.gz | |
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 <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -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 15bd4a648a..070041f7a8 100755 --- a/t/t4014-format-patch.sh +++ b/t/t4014-format-patch.sh @@ -445,22 +445,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 ' |