From a418441b4ea2ab69a17636c3020a29394d4c6562 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Santi=20B=C3=A9jar?= Date: Thu, 16 Jul 2009 02:09:14 +0200 Subject: [PATCH] t5520-pull: Test for rebased upstream + fetch + pull --rebase MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit If your upstream has rebased you can do: git pull --rebase but only if you haven't fetch before. Mark this case as test_expect_failure, in a later patch it will be changed to test_expect_success. Signed-off-by: Santi Béjar Signed-off-by: Junio C Hamano --- t/t5520-pull.sh | 14 ++++++++++++++ 1 file changed, 14 insertions(+) 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 && -- 2.11.4.GIT