From: Denton Liu Date: Wed, 23 Oct 2019 23:32:33 +0000 (-0700) Subject: t4108: use `test_config` instead of `git config` X-Git-Tag: v2.25.0-rc0~140^2~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=95806205cd7013f524b6a7f10afc8542ab0c1929;p=thirdparty%2Fgit.git t4108: use `test_config` instead of `git config` 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 Signed-off-by: Junio C Hamano --- 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 &&