diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-08-21 11:33:08 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-08-21 11:33:08 -0700 |
| commit | 07d6309e63aa272d2930540faa72147dc5be97a5 (patch) | |
| tree | 90ac260b170f62b92d4169de01f39dfcbf67460e /t | |
| parent | filter-branch: make the usage string fit on 80 chars terminals. (diff) | |
| parent | pull: support rebased upstream + fetch + pull --rebase (diff) | |
| download | tgif-07d6309e63aa272d2930540faa72147dc5be97a5.tar.xz | |
Merge branch 'sb/maint-pull-rebase' into maint
* sb/maint-pull-rebase:
pull: support rebased upstream + fetch + pull --rebase
t5520-pull: Test for rebased upstream + fetch + pull --rebase
Diffstat (limited to 't')
| -rwxr-xr-x | t/t5520-pull.sh | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh index c5a2e66a09..e78d40242a 100755 --- a/t/t5520-pull.sh +++ b/t/t5520-pull.sh @@ -117,6 +117,19 @@ test_expect_success '--rebase with rebased default upstream' ' ' +test_expect_success '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 && + git pull --rebase && + test "conflicting modification" = "$(cat file)" && + test file = "$(cat file2)" + +' + test_expect_success 'pull --rebase dies early with dirty working directory' ' git checkout to-rebase && |