summaryrefslogtreecommitdiff
path: root/git-merge-resolve.sh
diff options
context:
space:
mode:
authorLibravatar Ævar Arnfjörð Bjarmason <avarab@gmail.com>2018-07-31 13:07:11 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-07-31 09:25:25 -0700
commit25f74f5234ffe2f0100b06c657fedb9cc7774ed3 (patch)
treec941b164cb28b78a19767df64e3621e87003cc9c /git-merge-resolve.sh
parentpush tests: remove redundant 'git push' invocation (diff)
downloadtgif-25f74f5234ffe2f0100b06c657fedb9cc7774ed3.tar.xz
push tests: fix logic error in "push" test assertion
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 <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions