diff options
| author |  Santi Béjar <santi@agolina.net> | 2009-07-16 02:09:14 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2009-07-19 10:28:50 -0700 |
| commit | a418441b4ea2ab69a17636c3020a29394d4c6562 (patch) | |
| tree | 419cbb13fa8afd7a4c7b4d8b770e5f7af720ed06 | |
| parent | Revert "mailinfo: Remove only one set of square brackets" (diff) | |
| download | tgif-a418441b4ea2ab69a17636c3020a29394d4c6562.tar.xz | |
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>
| -rwxr-xr-x | 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 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 && |