提交 7ad39a27 编写于 作者: J Junio C Hamano

t5520: test pulling an octopus into an unborn branch

The code comment for "git merge" in builtin/merge.c, we say

    If the merged head is a valid one there is no reason
    to forbid "git merge" into a branch yet to be born.
    We do the same for "git pull".

and t5520 does have an existing test for that behaviour.  However,
there was no test to make sure that 'git pull' to pull multiple
branches into an unborn branch must fail.
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
上级 55691133
......@@ -76,6 +76,15 @@ test_expect_success 'pulling into void does not remove new staged files' '
)
'
test_expect_success 'pulling into void must not create an octopus' '
git init cloned-octopus &&
(
cd cloned-octopus &&
test_must_fail git pull .. master master &&
! test -f file
)
'
test_expect_success 'test . as a remote' '
git branch copy master &&
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册