From 28a9ce00830b6662737e3fbd9ace1e42e77eb214 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Ri=C3=9Fe?= Date: Mon, 12 Aug 2024 11:34:45 +0200 Subject: [PATCH] Adapt patch to upstream changes --- tests/integration/git_annex_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/integration/git_annex_test.go b/tests/integration/git_annex_test.go index 667e57c499..f52f8759b1 100644 --- a/tests/integration/git_annex_test.go +++ b/tests/integration/git_annex_test.go @@ -752,11 +752,11 @@ func withAnnexCtxKeyFile(t *testing.T, ctx APITestContext, callback func()) { defer func() { // reset if gitAnnexUseGitSSHExists { - os.Setenv("GIT_ANNEX_USE_GIT_SSH", _gitAnnexUseGitSSH) + t.Setenv("GIT_ANNEX_USE_GIT_SSH", _gitAnnexUseGitSSH) } }() - os.Setenv("GIT_ANNEX_USE_GIT_SSH", "1") // withKeyFile works by setting GIT_SSH_COMMAND, but git-annex only respects that if this is set + t.Setenv("GIT_ANNEX_USE_GIT_SSH", "1") // withKeyFile works by setting GIT_SSH_COMMAND, but git-annex only respects that if this is set withCtxKeyFile(t, ctx, callback) }