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 <liu.denton@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Denton Liu committed
Oct 23, 2019 at 16:32 UTC
95806205cd7013f524b6a7f10afc8542ab0c1929
1 file changed
+1
-1
t/t4108-apply-threeway.sh
+1
-1
@@ -70,7 +70,7 @@ test_expect_success 'apply with --3way' '
70
'
71
72
test_expect_success 'apply with --3way with rerere enabled' '
73
- git config rerere.enabled true &&
73
+ test_config rerere.enabled true &&
74
75
# Merging side should be similar to applying this patch
76
git diff ...side >P.diff &&