* [PATCH] test: mergetool: unset environment variable
@ 2023-05-13 15:27 Felipe Contreras
0 siblings, 0 replies; only message in thread
From: Felipe Contreras @ 2023-05-13 15:27 UTC (permalink / raw)
To: git; +Cc: Denton Liu, Ævar Arnfjörð Bjarmason,
Felipe Contreras
Since a regression in vimdiff I wrote my own tool and set
MERGE_TOOLS_DIR to use that tool, and ever since then these tests fail.
I've been manually unsetting this variable to run the test suite, but
this is something the testing framework should do.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
t/t7610-mergetool.sh | 2 ++
t/t7800-difftool.sh | 2 ++
2 files changed, 4 insertions(+)
diff --git a/t/t7610-mergetool.sh b/t/t7610-mergetool.sh
index 22b3a85b3e..cc99c29c81 100755
--- a/t/t7610-mergetool.sh
+++ b/t/t7610-mergetool.sh
@@ -12,6 +12,8 @@ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
. ./test-lib.sh
+unset MERGE_TOOLS_DIR
+
# All the mergetool test work by checking out a temporary branch based
# off 'branch1' and then merging in main and checking the results of
# running mergetool
diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh
index 59d3847bf8..d78a7ee90b 100755
--- a/t/t7800-difftool.sh
+++ b/t/t7800-difftool.sh
@@ -13,6 +13,8 @@ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
. ./test-lib.sh
+unset MERGE_TOOLS_DIR
+
difftool_test_setup ()
{
test_config diff.tool test-tool &&
--
2.40.0+fc1
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2023-05-13 15:27 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-05-13 15:27 [PATCH] test: mergetool: unset environment variable Felipe Contreras
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).