Re: [PATCH v4 3/6] fetch tests: add a test for clobbering tag behavior
From: Junio C Hamano <hidden>
Date: 2018-08-30 21:22:18
Ævar Arnfjörð Bjarmason [off-list ref] writes:
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 <redacted>
---Good addition, and correctly uses $tag_type_description unlike the one that is left unfixed in 2/6 for the push side.
quoted hunk
t/t5516-fetch-push.sh | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+)diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh index 69f7c9bfe6..3cde72ae47 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 -mtag.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 -mtag.message" + test_expect_success 'push --porcelain' ' mk_empty testrepo && echo >.git/foo "To testrepo" &&