From: Denton Liu Date: Wed, 23 Oct 2019 23:32:33 GMT Subject: [PATCH v2 3/5] t4108: use `test_config` instead of `git config` Message-ID: <43c42b299eb8a4e3a1cc529f1b799ed0edb3e720.1571873435.git.liu.denton@gmail.com> In-Reply-To: Since `git config` leaves the configurations set even after the test case completes, use `test_config` instead so that the configurations are reset once the test case finishes. Signed-off-by: Denton Liu --- t/t4108-apply-threeway.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t4108-apply-threeway.sh b/t/t4108-apply-threeway.sh index 3c0ddacddf..7f96ae9101 100755 --- a/t/t4108-apply-threeway.sh +++ b/t/t4108-apply-threeway.sh @@ -70,7 +70,7 @@ test_expect_success 'apply with --3way' ' ' test_expect_success 'apply with --3way with rerere enabled' ' - git config rerere.enabled true && + test_config rerere.enabled true && # Merging side should be similar to applying this patch git diff ...side >P.diff && -- 2.24.0.rc0.197.g0926ab8072