From: Santi Béjar <santi@agolina.net>
Date: Thu, 16 Jul 2009 00:09:14 +0000 (+0200)
Subject: t5520-pull: Test for rebased upstream + fetch + pull --rebase
X-Git-Tag: v1.6.4.1~6^2~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=a418441b4ea2ab69a17636c3020a29394d4c6562;p=git.git

t5520-pull: Test for rebased upstream + fetch + pull --rebase

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 <santi@agolina.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
index c5a2e66a0..3ebc886bd 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 &&