git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
Denton Liu <liu.denton@gmail.com>
Date
Oct 23, 2019, 12:03 UTC
Message-ID
<d77c5f4199562947cabc89c63b55faee345fd8fd.1571832176.git.liu.denton@gmail.com>
In-Reply-To
<cover.1571832176.git.liu.denton@gmail.com>

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 --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 &&

-- 
2.24.0.rc0.197.g0926ab8072
Previous: Denton LiuNext: Denton Liu
Message 6 of 16 in “apply: fix merge.conflictStyle bug in --3way”
  1. 0/5 apply: fix merge.conflictStyle bug in --3wayDenton Liu, Oct 23, 2019
  2. 1/5 t4108: replace create_file with test_write_linesDenton Liu, Oct 23, 2019
  3. 2/5 t4108: remove git command upstream of pipeDenton Liu, Oct 23, 2019
  4. Eric SunshineOct 23, 2019
  5. Denton LiuOct 23, 2019
  6. 3/5 t4108: use `test_config` instead of `git config`Denton Liu, Oct 23, 2019
  7. 4/5 t4108: demonstrate bug in applyDenton Liu, Oct 23, 2019
  8. Eric SunshineOct 23, 2019
  9. 5/5 apply: respect merge.conflictStyle in --3wayDenton Liu, Oct 23, 2019
  10. Junio C HamanoOct 24, 2019
  11. 0/5 This fixes a bug where even if `merge.conflictStyle = diff3`, running `git apply --3way` would not output the base.Denton Liu, Oct 23, 2019
  12. 1/5 t4108: replace create_file with test_write_linesDenton Liu, Oct 23, 2019
  13. 2/5 t4108: remove git command upstream of pipeDenton Liu, Oct 23, 2019
  14. 3/5 t4108: use `test_config` instead of `git config`Denton Liu, Oct 23, 2019
  15. 4/5 t4108: demonstrate bug in applyDenton Liu, Oct 23, 2019
  16. 5/5 apply: respect merge.conflictStyle in --3wayDenton Liu, Oct 23, 2019

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.