All of lore.kernel.org
 help / color / mirror / Atom feed
From: Felipe Contreras <felipe.contreras@gmail.com>
To: git@vger.kernel.org
Cc: "Denton Liu" <liu.denton@gmail.com>,
	"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
	"Felipe Contreras" <felipe.contreras@gmail.com>
Subject: [PATCH] test: mergetool: unset environment variable
Date: Sat, 13 May 2023 09:27:34 -0600	[thread overview]
Message-ID: <20230513152734.3275192-1-felipe.contreras@gmail.com> (raw)

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


                 reply	other threads:[~2023-05-13 15:27 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230513152734.3275192-1-felipe.contreras@gmail.com \
    --to=felipe.contreras@gmail.com \
    --cc=avarab@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=liu.denton@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.