Merge branch 'cb/maint-1.6.3-grep-relative-up' into maint

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

diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
index c5a2e66a09b9a871fb97142a58de51097a685ae0..e78d40242a80d9b2aa74e74d3a4aecddbb63ab99 100755 (executable)
--- a/t/t5520-pull.sh
+++ b/t/t5520-pull.sh
@@ -117,6 +117,19 @@ test_expect_success '--rebase with rebased default upstream' '
 
 '
 
+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 &&
+       git pull --rebase &&
+       test "conflicting modification" = "$(cat file)" &&
+       test file = "$(cat file2)"
+
+'
+
 test_expect_success 'pull --rebase dies early with dirty working directory' '
 
        git checkout to-rebase &&