diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-01-23 21:16:49 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-01-23 21:16:49 -0800 |
| commit | d82dd26964b9d7b39fb74367e5fcc3e3f4593324 (patch) | |
| tree | 98a0e47689e6494af3befdef3bbdad9dcdddabec /t | |
| parent | Merge branch 'mh/imap-send-shrinkage' (diff) | |
| parent | push: fix "refs/tags/ hierarchy cannot be updated without --force" (diff) | |
| download | tgif-d82dd26964b9d7b39fb74367e5fcc3e3f4593324.tar.xz | |
Merge branch 'cr/push-force-tag-update'
Regression fix to stop "git push" complaining "target ref already
exists", when it is not the real reason the command rejected the
request (e.g. non-fast-forward).
* cr/push-force-tag-update:
push: fix "refs/tags/ hierarchy cannot be updated without --force"
Diffstat (limited to 't')
| -rwxr-xr-x | t/t5516-fetch-push.sh | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh index 60093728fe..8f024a08f0 100755 --- a/t/t5516-fetch-push.sh +++ b/t/t5516-fetch-push.sh @@ -950,27 +950,6 @@ test_expect_success 'push requires --force to update lightweight tag' ' ) ' -test_expect_success 'push requires --force to update annotated tag' ' - mk_test heads/master && - mk_child child1 && - mk_child child2 && - ( - cd child1 && - git tag -a -m "message 1" Tag && - git push ../child2 Tag:refs/tmp/Tag && - git push ../child2 Tag:refs/tmp/Tag && - >file1 && - git add file1 && - git commit -m "file1" && - git tag -f -a -m "message 2" Tag && - test_must_fail git push ../child2 Tag:refs/tmp/Tag && - git push --force ../child2 Tag:refs/tmp/Tag && - git tag -f -a -m "message 3" Tag HEAD~ && - test_must_fail git push ../child2 Tag:refs/tmp/Tag && - git push --force ../child2 Tag:refs/tmp/Tag - ) -' - test_expect_success 'push --porcelain' ' mk_empty && echo >.git/foo "To testrepo" && |