mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
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: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
5569113329
commit
7ad39a2784
|
@ -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 &&
|
||||
|
|
Loading…
Reference in a new issue