From 5c2303e0c7a981528dae68d4979d3bfdc2526276 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Date: Tue, 5 Jan 2021 20:42:37 +0100 Subject: [PATCH] mktag tests: don't create "mytag" twice MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change a test added in e0aaf781f6 (mktag.c: improve verification of tagger field and tests, 2008-03-27) to not create "mytag", which should only be created and verified at the end in an earlier test added in 446c6faec6 (New tests and en-passant modifications to mktag., 2006-07-29). While we're at it let's prevent a similar logic error from creeping into the test by asserting that "mytag" doesn't exist before we create it. Let's do this by moving the test to use "update-ref", instead of our own homebrew ad-hoc refstore update. We're not really testing for anything yet by creating the tag at the end here. A subsequent commit will change that. Signed-off-by: Ævar Arnfjörð Bjarmason Signed-off-by: Junio C Hamano --- t/t3800-mktag.sh | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/t/t3800-mktag.sh b/t/t3800-mktag.sh index c542c3e1a8..bb300d567d 100755 --- a/t/t3800-mktag.sh +++ b/t/t3800-mktag.sh @@ -222,7 +222,7 @@ EOF test_expect_success \ 'allow empty tag email' \ - 'git mktag .git/refs/tags/mytag' + 'git mktag 1206478233 -0500 EOF -test_expect_success \ - 'create valid tag' \ - 'git mktag .git/refs/tags/mytag' - -############################################################ -# 25. check mytag - -test_expect_success \ - 'check mytag' \ - 'git tag -l | grep mytag' - +test_expect_success 'create valid tag' ' + git mktag hash && + git update-ref refs/tags/mytag $(cat hash) $(test_oid zero) +' test_done