diff options
Diffstat (limited to 't/t5520-pull.sh')
| -rwxr-xr-x | t/t5520-pull.sh | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh index c5a2e66a09..3ebc886bdc 100755 --- a/t/t5520-pull.sh +++ b/t/t5520-pull.sh @@ -117,6 +117,20 @@ test_expect_success '--rebase with rebased default upstream' ' ' +test_expect_failure 'rebased upstream + fetch + pull --rebase' ' + + git update-ref refs/remotes/me/copy copy-orig && + git reset --hard to-rebase-orig && + git checkout --track -b to-rebase3 me/copy && + git reset --hard to-rebase-orig && + git fetch && + test_must_fail git pull --rebase && + git rebase --abort && + test "conflicting modification" = "$(cat file)" && + test file = "$(cat file2)" + +' + test_expect_success 'pull --rebase dies early with dirty working directory' ' git checkout to-rebase && |