Merge branch 'ph/format-patch-no-color'

* ph/format-patch-no-color: t4014: clean up format.thread config after each test
git-mirror · Sep 19, 2011 · 9b502a3 · 9b502a3
2 parents 167a580 + e810715
commit 9b502a3
Showing 1 changed file with 4 additions and 4 deletions.
diff --git 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
 '