From 54e934e66ddc9d61b3a8b2a6956bd434e6fccfcd Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Date: Tue, 31 Jul 2018 13:07:09 +0000 Subject: [PATCH] fetch tests: change "Tag" test tag to "testTag" MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Calling the test tag "Tag" will make for confusing reading later in this series when making use of the "git push tag " feature. Let's call the tag testTag instead. Changes code initially added in dbfeddb12e ("push: require force for refs under refs/tags/", 2012-11-29). Signed-off-by: Ævar Arnfjörð Bjarmason Signed-off-by: Junio C Hamano --- t/t5516-fetch-push.sh | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh index a5077d8b7c..08b9cf581d 100755 --- a/t/t5516-fetch-push.sh +++ b/t/t5516-fetch-push.sh @@ -971,18 +971,18 @@ test_expect_success 'push requires --force to update lightweight tag' ' mk_child testrepo child2 && ( cd child1 && - git tag Tag && - git push ../child2 Tag && - git push ../child2 Tag && + git tag testTag && + git push ../child2 testTag && + git push ../child2 testTag && >file1 && git add file1 && git commit -m "file1" && - git tag -f Tag && - test_must_fail git push ../child2 Tag && - git push --force ../child2 Tag && - git tag -f Tag && - test_must_fail git push ../child2 Tag HEAD~ && - git push --force ../child2 Tag + git tag -f testTag && + test_must_fail git push ../child2 testTag && + git push --force ../child2 testTag && + git tag -f testTag && + test_must_fail git push ../child2 testTag HEAD~ && + git push --force ../child2 testTag ) ' -- 2.40.0