diff options
| author | Denton Liu <liu.denton@gmail.com> | 2019-10-23 23:32:33 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-10-24 02:32:53 (GMT) |
| commit | 95806205cd7013f524b6a7f10afc8542ab0c1929 (patch) | |
| tree | bf5ac8eedaa8f933fdc06dd86e3c66961bd43ca6 /t/t4108-apply-threeway.sh | |
| parent | b0069684d430ea67fd3fbe019c71a18d4ef87fa3 (diff) | |
| download | git-95806205cd7013f524b6a7f10afc8542ab0c1929.zip git-95806205cd7013f524b6a7f10afc8542ab0c1929.tar.gz git-95806205cd7013f524b6a7f10afc8542ab0c1929.tar.bz2 | |
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>
Diffstat (limited to 't/t4108-apply-threeway.sh')
| -rwxr-xr-x | t/t4108-apply-threeway.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t4108-apply-threeway.sh b/t/t4108-apply-threeway.sh index 3c0ddac..7f96ae9 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 && |