[PATCHv4 3/4] t5520-pull: --rebase with rebased upstream and two branches

From: Santi Béjar <santi@agolina.net>
Date: Jun 11, 2009, 22:39 UTC
Message-ID: <1244759961-4750-4-git-send-email-santi@agolina.net>
In-Reply-To: <1244759961-4750-1-git-send-email-santi@agolina.net>

If you have two branches tracking an upstream that is rebased, currently you have to do:

git checkout branch1 git pull --rebase remote branch git checkout branch2 git pull --rebase remote branch

The second rebase works because the first "git pull --rebase" does not store in the local tracking branch the new value, so the second rebase detects that it is rebased.

I think one should be able to do the same without the explicit arguments to "git pull --rebase", but without arguments it stores the new state of the remote branch so the second "git pull --rebase" does not work.

Mark this case as test_expect_failure to make people aware of this behavior.

Signed-off-by: Santi Béjar <santi@agolina.net>
---
Changes since v3:
  - Move the "git rebase --abort" to the failing test to not polute the
    next test.

Hi,

I just wanted to make people aware of this behavior and then decide if this is the correct behavior. Then we can document it, or try to find a better solution.

Santi

 t/t5520-pull.sh |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 deletions(-)

diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
index c5a2e66..a4ac6d2 100755
--- a/t/t5520-pull.sh
+++ b/t/t5520-pull.sh
@@ -117,6 +117,23 @@ test_expect_success '--rebase with rebased default upstream' '
 
 '
 
+test_expect_failure '--rebase with rebased upstream and two branches' '
+
+	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 pull --rebase &&
+	test "conflicting modification" = "$(cat file)" &&
+	test file = $(cat file2) &&
+	git checkout to-rebase2 &&
+	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.3.2.206.g417f7