diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2018-08-31 20:09:59 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-31 21:04:06 (GMT) |
| commit | 6b0b0677f6d92932bacd73981a47724b543dfd90 (patch) | |
| tree | 913944d31df3ee72ecb7acd46830f10f8993664a /t | |
| parent | 253b3d4f57266449c4351e992263eb1cf615a0ae (diff) | |
| download | git-6b0b0677f6d92932bacd73981a47724b543dfd90.zip git-6b0b0677f6d92932bacd73981a47724b543dfd90.tar.gz git-6b0b0677f6d92932bacd73981a47724b543dfd90.tar.bz2 | |
fetch tests: add a test for clobbering tag behavior
The test suite only incidentally (and unintentionally) tested for the
current behavior of eager tag clobbering on "fetch". This is a
followup to 380efb65df ("push tests: assert re-pushing annotated
tags", 2018-07-31) which tests for it explicitly.
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-x | t/t5516-fetch-push.sh | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh index 5023908..a2d4f37 100755 --- a/t/t5516-fetch-push.sh +++ b/t/t5516-fetch-push.sh @@ -1011,6 +1011,30 @@ test_force_push_tag () { test_force_push_tag "lightweight tag" "-f" test_force_push_tag "annotated tag" "-f -a -m'tag message'" +test_force_fetch_tag () { + tag_type_description=$1 + tag_args=$2 + + test_expect_success "fetch will clobber an existing $tag_type_description" " + mk_test testrepo heads/master && + mk_child testrepo child1 && + mk_child testrepo child2 && + ( + cd testrepo && + git tag testTag && + git -C ../child1 fetch origin tag testTag && + >file1 && + git add file1 && + git commit -m 'file1' && + git tag $tag_args testTag && + git -C ../child1 fetch origin tag testTag + ) + " +} + +test_force_fetch_tag "lightweight tag" "-f" +test_force_fetch_tag "annotated tag" "-f -a -m'tag message'" + test_expect_success 'push --porcelain' ' mk_empty testrepo && echo >.git/foo "To testrepo" && |