diff options
| author | Paul Tan <pyokagan@gmail.com> | 2015-05-29 19:44:42 +0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-05-29 09:15:24 -0700 |
| commit | 9570d67c00d6f2994e540aab3abee8f989c350ea (patch) | |
| tree | 8edff964c4c393d311f4855b2e4e07075186b925 | |
| parent | 9f992262fb8fdbac94f3a86f6bdf7182aab7feb6 (diff) | |
| download | git-9570d67c00d6f2994e540aab3abee8f989c350ea.tar.gz | |
t5520: test --rebase with multiple branches
Since rebasing on top of multiple upstream branches does not make sense,
since 51b2ead (disallow providing multiple upstream branches to rebase,
pull --rebase, 2009-02-18), 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 <pyokagan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t5520-pull.sh | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh index 872d765b5c..90728e0094 100755 --- a/t/t5520-pull.sh +++ b/t/t5520-pull.sh @@ -217,6 +217,15 @@ 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>err && + test "$(git rev-parse HEAD)" = "$(git rev-parse before-rebase)" && + test_i18ngrep "Cannot rebase onto multiple branches" err && + test modified = "$(git show HEAD:file)" +' + test_expect_success 'pull.rebase' ' git reset --hard before-rebase && test_config pull.rebase true && |