{"thread":{"id":"59741","subject":"[PATCH] test: mergetool: unset environment variable","startedAt":"2023-05-13T15:27:43Z","lastAt":"2023-05-13T15:27:43Z","messageCount":1,"participants":["Felipe Contreras"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"477256","messageId":"20230513152734.3275192-1-felipe.contreras@gmail.com","threadId":"59741","inReplyTo":null,"subject":"[PATCH] test: mergetool: unset environment variable","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2023-05-13T15:27:34Z","receivedAt":"2023-05-13T15:27:43Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"Since a regression in vimdiff I wrote my own tool and set\nMERGE_TOOLS_DIR to use that tool, and ever since then these tests fail.\n\nI've been manually unsetting this variable to run the test suite, but\nthis is something the testing framework should do.\n\nSigned-off-by: Felipe Contreras <felipe.contreras@gmail.com>\n---\n t/t7610-mergetool.sh | 2 ++\n t/t7800-difftool.sh  | 2 ++\n 2 files changed, 4 insertions(+)\n\ndiff --git a/t/t7610-mergetool.sh b/t/t7610-mergetool.sh\nindex 22b3a85b3e..cc99c29c81 100755\n--- a/t/t7610-mergetool.sh\n+++ b/t/t7610-mergetool.sh\n@@ -12,6 +12,8 @@ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\n \n . ./test-lib.sh\n \n+unset MERGE_TOOLS_DIR\n+\n # All the mergetool test work by checking out a temporary branch based\n # off 'branch1' and then merging in main and checking the results of\n # running mergetool\ndiff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh\nindex 59d3847bf8..d78a7ee90b 100755\n--- a/t/t7800-difftool.sh\n+++ b/t/t7800-difftool.sh\n@@ -13,6 +13,8 @@ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\n \n . ./test-lib.sh\n \n+unset MERGE_TOOLS_DIR\n+\n difftool_test_setup ()\n {\n \ttest_config diff.tool test-tool &&\n-- \n2.40.0+fc1\n\n"}]}