summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>2018-07-31 13:07:09 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-07-31 16:25:25 (GMT)
commit54e934e66ddc9d61b3a8b2a6956bd434e6fccfcd (patch)
tree1a6d3b5223d419375e0edd1b03214ca9897cc607 /t
parentffc6fa0e396238de3a30623912980263b4f283ab (diff)
downloadgit-54e934e66ddc9d61b3a8b2a6956bd434e6fccfcd.zip
git-54e934e66ddc9d61b3a8b2a6956bd434e6fccfcd.tar.gz
git-54e934e66ddc9d61b3a8b2a6956bd434e6fccfcd.tar.bz2
fetch tests: change "Tag" test tag to "testTag"
Calling the test tag "Tag" will make for confusing reading later in this series when making use of the "git push tag <name>" 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 <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
-rwxr-xr-xt/t5516-fetch-push.sh18
1 files changed, 9 insertions, 9 deletions
diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh
index a5077d8..08b9cf5 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
)
'