Merge branch 'jc/maint-merge-recursive-fix'

[git.git] / t / t5520-pull.sh

diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
index 3ebc886bdcb97f2473ab2e05afdad933401f44b8..e78d40242a80d9b2aa74e74d3a4aecddbb63ab99 100755 (executable)
--- a/t/t5520-pull.sh
+++ b/t/t5520-pull.sh
@@ -117,15 +117,14 @@ test_expect_success '--rebase with rebased default upstream' '
 
 '
 
-test_expect_failure 'rebased upstream + fetch + pull --rebase' '
+test_expect_success '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 &&
+       git pull --rebase &&
        test "conflicting modification" = "$(cat file)" &&
        test file = "$(cat file2)"