git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: David Aguilar <davvid@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: "Git Mailing List" <git@vger.kernel.org>,
	"Johannes Schindelin" <Johannes.Schindelin@gmx.de>,
	"Alan Blotz" <work@blotz.org>,
	"Đoàn Trần Công Danh" <congdanhqx@gmail.com>
Subject: [PATCH 1/4] t7800-difftool: cleanup temporary repositories used by tests
Date: Sat, 18 Sep 2021 18:57:26 -0700	[thread overview]
Message-ID: <20210919015729.98323-1-davvid@gmail.com> (raw)

The "dirlinks" and "growing" repositories should not outlive the
tests that use them.

Signed-off-by: David Aguilar <davvid@gmail.com>
---
 t/t7800-difftool.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh
index a173f564bc..a923f193da 100755
--- a/t/t7800-difftool.sh
+++ b/t/t7800-difftool.sh
@@ -414,6 +414,7 @@ test_expect_success 'setup change in subdirectory' '
 test_expect_success 'difftool -d with growing paths' '
 	a=aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa &&
 	git init growing &&
+	test_when_finished rm -rf growing &&
 	(
 		cd growing &&
 		echo "test -f \"\$2/b\"" | write_script .git/test-for-b.sh &&
@@ -646,6 +647,7 @@ test_expect_success 'difftool properly honors gitlink and core.worktree' '
 test_expect_success SYMLINKS 'difftool --dir-diff symlinked directories' '
 	test_when_finished git reset --hard &&
 	git init dirlinks &&
+	test_when_finished rm -rf dirlinks &&
 	(
 		cd dirlinks &&
 		git config diff.tool checktrees &&
-- 
2.30.1 (Apple Git-130)


             reply	other threads:[~2021-09-19  1:57 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-09-19  1:57 David Aguilar [this message]
2021-09-19  1:57 ` [PATCH 2/4] difftool: add a missing space to the run_dir_diff() comments David Aguilar
2021-09-19  1:57 ` [PATCH 3/4] difftool: use a strbuf to create the tmpdir path David Aguilar
2021-09-19  2:17   ` Jeff King
2021-09-19  2:33     ` [PATCH v2 " David Aguilar
2021-09-20 18:35       ` Junio C Hamano
2021-09-19  9:00   ` [PATCH " Johannes Sixt
2021-09-19 18:13     ` David Aguilar
2021-09-19 18:46       ` Johannes Sixt
2021-09-19 19:28         ` David Aguilar
2021-09-19 19:50           ` Johannes Sixt
2021-09-19  1:57 ` [PATCH 4/4] difftool: fix symlink-file writing in dir-diff mode David Aguilar
2021-09-19  2:02   ` [PATCH v2 " David Aguilar
2021-09-19  2:21     ` [PATCH v3 " David Aguilar
2021-09-19 13:25 ` [PATCH 1/4] t7800-difftool: cleanup temporary repositories used by tests Ævar Arnfjörð Bjarmason
2021-09-20 18:28 ` Junio C Hamano

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=20210919015729.98323-1-davvid@gmail.com \
    --to=davvid@gmail.com \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=congdanhqx@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=work@blotz.org \
    /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 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 NNTP newsgroup(s).