[PATCH 1/2] t5520-pull: Test for rebased upstream + fetch + pull --rebase

From

SBSanti Béjar <santi@agolina.net>

Date

Jul 16, 2009, 00:09 UTC

Message-ID

<1247702955-1559-1-git-send-email-santi@agolina.net>

If your upstream has rebased you can do:

git pull --rebase

but only if you haven't fetch before.

Signed-off-by: Santi Béjar <santi@agolina.net>
---
 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 c5a2e66..1aae494 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 &&

-- 
1.6.4.rc0.18.g60787.dirty