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@xxxxxxxxx>
---
t/t5520-pull.sh | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
index 227d293..01ae1bf 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 &&
--
2.1.4
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html