t7004: create separate tags for different tests

Reftable intentionally keeps reflog data for deleted refs.

This breaks tests that delete and recreate "refs/tags/tag_with_reflog" as traces
of the deletion are left in reflog. To resolve this, use a differently named ref
for each test case.

Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh
index 082be85dffc7b1765471e11d2c580c853cf0965b..301d11904829f5952bb9d0c00e0c1ee8bb8b8d5d 100755 (executable)
--- a/t/t7004-tag.sh
+++ b/t/t7004-tag.sh
@@ -94,10 +94,10 @@ test_expect_success 'creating a tag with --create-reflog should create reflog' '
        git log -1 \
                --format="format:tag: tagging %h (%s, %cd)%n" \
                --date=format:%Y-%m-%d >expected &&
-       test_when_finished "git tag -d tag_with_reflog" &&
-       git tag --create-reflog tag_with_reflog &&
-       git reflog exists refs/tags/tag_with_reflog &&
-       sed -e "s/^.*   //" .git/logs/refs/tags/tag_with_reflog >actual &&
+       test_when_finished "git tag -d tag_with_reflog1" &&
+       git tag --create-reflog tag_with_reflog1 &&
+       git reflog exists refs/tags/tag_with_reflog1 &&
+       sed -e "s/^.*   //" .git/logs/refs/tags/tag_with_reflog1 >actual &&
        test_cmp expected actual
 '
 
@@ -105,10 +105,10 @@ test_expect_success 'annotated tag with --create-reflog has correct message' '
        git log -1 \
                --format="format:tag: tagging %h (%s, %cd)%n" \
                --date=format:%Y-%m-%d >expected &&
-       test_when_finished "git tag -d tag_with_reflog" &&
-       git tag -m "annotated tag" --create-reflog tag_with_reflog &&
-       git reflog exists refs/tags/tag_with_reflog &&
-       sed -e "s/^.*   //" .git/logs/refs/tags/tag_with_reflog >actual &&
+       test_when_finished "git tag -d tag_with_reflog2" &&
+       git tag -m "annotated tag" --create-reflog tag_with_reflog2 &&
+       git reflog exists refs/tags/tag_with_reflog2 &&
+       sed -e "s/^.*   //" .git/logs/refs/tags/tag_with_reflog2 >actual &&
        test_cmp expected actual
 '
 
@@ -118,10 +118,10 @@ test_expect_success '--create-reflog does not create reflog on failure' '
 '
 
 test_expect_success 'option core.logAllRefUpdates=always creates reflog' '
-       test_when_finished "git tag -d tag_with_reflog" &&
+       test_when_finished "git tag -d tag_with_reflog3" &&
        test_config core.logAllRefUpdates always &&
-       git tag tag_with_reflog &&
-       git reflog exists refs/tags/tag_with_reflog
+       git tag tag_with_reflog3 &&
+       git reflog exists refs/tags/tag_with_reflog3
 '
 
 test_expect_success 'listing all tags if one exists should succeed' '