[PATCH 5/7] t5520: test --rebase with multiple branches
flat view
STALE3771d
SUPERSEDED
From: Paul Tan <hidden>
Date: 2016-06-15 23:04:37
Subsystem:
the rest · Maintainer:
Linus Torvalds
Revision v1 of 5 in this series.
Revisions (5)
Since rebasing on top of multiple upstream branches does not make sense,
since commit 51b2ead0 ("disallow providing multiple upstream branches
to rebase, pull --rebase"), git-pull explicitly disallowed specifying
multiple branches in the rebase case.
Implement tests to ensure that git-pull fails and prints out the
user-friendly error message in such a case.
Signed-off-by: Paul Tan <redacted>
---
t/t5520-pull.sh | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
index 25d519d..17c63ff 100755
--- a/t/t5520-pull.sh
+++ b/t/t5520-pull.sh@@ -223,6 +223,14 @@ test_expect_success '--rebase' ' test $(git rev-parse HEAD^) = $(git rev-parse copy) && test new = $(git show HEAD:file2) ' + +test_expect_success '--rebase fails with multiple branches' ' + git reset --hard before-rebase && + test_must_fail git pull --rebase . copy master 2>out && + test_when_finished "rm -f out" && + test_i18ngrep "Cannot rebase onto multiple branches" out +' + test_expect_success 'pull.rebase' ' git reset --hard before-rebase && test_config pull.rebase true &&
--
2.1.4