summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-03-25 14:00:57 -0700
committerJunio C Hamano <gitster@pobox.com>2013-03-25 14:00:58 -0700
commit33c1506d6257897040eccc8167584a98fa8f88fe (patch)
tree1db2080386f66833d011ba7bd7fc321163b5573d /t
parentf10a012088a7b6e418ec3f726142a8ddfa3d0264 (diff)
parent3ae851e6fbb4e99fa7281d18a5c6f95a3fb6d998 (diff)
downloadgit-33c1506d6257897040eccc8167584a98fa8f88fe.tar.gz
Merge branch 'ph/tag-force-no-warn-on-creation'
"git tag -f <tag>" always said "Updated tag '<tag>'" even when creating a new tag (i.e. not overwriting nor updating). * ph/tag-force-no-warn-on-creation: tag: --force does not have to warn when creating tags
Diffstat (limited to 't')
-rwxr-xr-xt/t7004-tag.sh12
1 files changed, 12 insertions, 0 deletions
diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh
index f5a79b13ae..c8d6e9f88c 100755
--- a/t/t7004-tag.sh
+++ b/t/t7004-tag.sh
@@ -104,6 +104,18 @@ test_expect_success 'creating a tag using HEAD directly should succeed' '
tag_exists myhead
'
+test_expect_success '--force can create a tag with the name of one existing' '
+ tag_exists mytag &&
+ git tag --force mytag &&
+ tag_exists mytag'
+
+test_expect_success '--force is moot with a non-existing tag name' '
+ git tag newtag >expect &&
+ git tag --force forcetag >actual &&
+ test_cmp expect actual
+'
+git tag -d newtag forcetag
+
# deleting tags:
test_expect_success 'trying to delete an unknown tag should fail' '