diff options
| author | Paul Tan <pyokagan@gmail.com> | 2015-05-02 23:37:09 +0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-05-03 11:15:00 -0700 |
| commit | d4c07f652c0cbf00fb79d7f080f9e73b3d38bfe7 (patch) | |
| tree | 6e2fe9840a1c96433efd5a9f8b734b1e9d11928e | |
| parent | 3d4a3ffe64162b45ae7c991fc60623ecb4678cfd (diff) | |
| download | git-d4c07f652c0cbf00fb79d7f080f9e73b3d38bfe7.tar.gz | |
t5520: test pulling multiple branches into an empty repository
Commit d09e79cb ("allow pulling into an empty repository") introduced
the ability to pull into an empty head. As pulling in multiple branches
does not make sense in this context, git-pull explicitly fails when
there is an empty head and multiple branches are specified.
Add a test to ensure that this safeguard works.
Signed-off-by: Paul Tan <pyokagan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t5520-pull.sh | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh index 227d293350..01ae1bf4f0 100755 --- a/t/t5520-pull.sh +++ b/t/t5520-pull.sh @@ -86,6 +86,18 @@ test_expect_success 'pulling into void does not remove new staged files' ' ) ' +test_expect_success 'refuse to pull multiple branches into void' ' + git branch test master && + test_when_finished "git branch -D test" && + git init cloned-multiple-branches && + test_when_finished "rm -rf cloned-multiple-branches" && + ( + cd cloned-multiple-branches && + test_must_fail git pull .. master test 2>out && + test_i18ngrep "Cannot merge multiple branches into empty head" out + ) +' + test_expect_success 'test . as a remote' ' git branch copy master && |