Skip to content

Commit 9580620

Browse files
Denton-Lgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent b006968 commit 9580620

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

t/t4108-apply-threeway.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ test_expect_success 'apply with --3way' '
7070
'
7171

7272
test_expect_success 'apply with --3way with rerere enabled' '
73-
git config rerere.enabled true &&
73+
test_config rerere.enabled true &&
7474
7575
# Merging side should be similar to applying this patch
7676
git diff ...side >P.diff &&

0 commit comments

Comments
 (0)