summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-04-23 13:34:08 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-04-29 13:17:52 -0700
commit7ad39a2784fd2d2ad6538e687404cf7f35a1e771 (patch)
treeebde8c48dd0576430cdd9aa27b47e69ee02dab45 /builtin/merge.c
parentt5520: style fixes (diff)
downloadtgif-7ad39a2784fd2d2ad6538e687404cf7f35a1e771.tar.xz
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>
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions