]> git.ipfire.org Git - thirdparty/git.git/commitdiff
t4108: use `test_config` instead of `git config`
authorDenton Liu <liu.denton@gmail.com>
Wed, 23 Oct 2019 23:32:33 +0000 (16:32 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 24 Oct 2019 02:32:53 +0000 (11:32 +0900)
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>
t/t4108-apply-threeway.sh

index 3c0ddacddf88348f34066240c5af0bf660ec8fa8..7f96ae9101ad674f81838a13386ce618b03c9a32 100755 (executable)
@@ -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 &&