From 25f74f5234ffe2f0100b06c657fedb9cc7774ed3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Date: Tue, 31 Jul 2018 13:07:11 +0000 Subject: [PATCH] push tests: fix logic error in "push" test assertion MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Fix a logic error that's been here since this test was added in dbfeddb12e ("push: require force for refs under refs/tags/", 2012-11-29). The intent of this test is to force-create a new tag pointing to HEAD~, and then assert that pushing it doesn't work without --force. Instead, the code was not creating a new tag at all, and then failing to push the previous tag for the unrelated reason of providing a refspec that doesn't make any sense. Signed-off-by: Ævar Arnfjörð Bjarmason Signed-off-by: Junio C Hamano --- t/t5516-fetch-push.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh index 4d487d6875..82af990ab3 100755 --- a/t/t5516-fetch-push.sh +++ b/t/t5516-fetch-push.sh @@ -979,8 +979,8 @@ test_expect_success 'push requires --force to update lightweight tag' ' git tag -f testTag && test_must_fail git push ../child2 testTag && git push --force ../child2 testTag && - git tag -f testTag && - test_must_fail git push ../child2 testTag HEAD~ && + git tag -f testTag HEAD~ && + test_must_fail git push ../child2 testTag && git push --force ../child2 testTag ) ' -- 2.39.5