| commit | 7ad39a2784fd2d2ad6538e687404cf7f35a1e771 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 23 Apr 2015 20:34:08 +0000 (23 13:34 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 29 Apr 2015 20:17:52 +0000 (29 13:17 -0700) | ||
| tree | ebde8c48dd0576430cdd9aa27b47e69ee02dab45 | treesnapshot (tar.gz zip) |
| parent | 55691133291560eacaf03003528e007a3534213d | commitdiff |
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>
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>
| t/t5520-pull.sh | diffblobblamehistory |