diff mbox series

[3/5] t4108: use `test_config` instead of `git config`

Message ID d77c5f4199562947cabc89c63b55faee345fd8fd.1571832176.git.liu.denton@gmail.com (mailing list archive)
State New, archived
Headers show
Series apply: fix merge.conflictStyle bug in --3way | expand

Commit Message

Denton Liu Oct. 23, 2019, 12:03 p.m. UTC 
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>
---
 t/t4108-apply-threeway.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/t/t4108-apply-threeway.sh b/t/t4108-apply-threeway.sh
index 49739ce8b4..3615256492 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 &&