fetch: stop clobbering existing tags without --force

diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh
index a2d4f375fc38f0cae255af4c06d17e51221914fa..c545b16d13229728bcc216fe91e8507b7cabfcd0 100755 (executable)
--- a/t/t5516-fetch-push.sh
+++ b/t/t5516-fetch-push.sh
@@ -1015,7 +1015,7 @@ test_force_fetch_tag () {
        tag_type_description=$1
        tag_args=$2
 
-       test_expect_success "fetch will clobber an existing $tag_type_description" "
+       test_expect_success "fetch will not clobber an existing $tag_type_description without --force" "
                mk_test testrepo heads/master &&
                mk_child testrepo child1 &&
                mk_child testrepo child2 &&
@@ -1027,7 +1027,8 @@ test_force_fetch_tag () {
                        git add file1 &&
                        git commit -m 'file1' &&
                        git tag $tag_args testTag &&
-                       git -C ../child1 fetch origin tag testTag
+                       test_must_fail git -C ../child1 fetch origin tag testTag &&
+                       git -C ../child1 fetch origin '+refs/tags/*:refs/tags/*'
                )
        "
 }