diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-06-20 21:47:13 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-06-20 21:47:13 -0700 |
| commit | 12d4ffaa94c1379c307cdf489565531c5d6c94fd (patch) | |
| tree | 2e6897478bb7449bcd0bcb58022ae71af112c3f1 /t | |
| parent | Merge branch 'pb/send-email-cccmd-fix' (diff) | |
| parent | parse-remote: remove unused functions (diff) | |
| download | git-12d4ffaa94c1379c307cdf489565531c5d6c94fd.tar.gz git-12d4ffaa94c1379c307cdf489565531c5d6c94fd.zip | |
Merge branch 'sb/pull-rebase'
* sb/pull-rebase:
parse-remote: remove unused functions
parse-remote: support default reflist in get_remote_merge_branch
parse-remote: function to get the tracking branch to be merge
Diffstat (limited to 't')
| -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 725771fac1..c5a2e66a09 100755 --- a/t/t5520-pull.sh +++ b/t/t5520-pull.sh @@ -92,20 +92,34 @@ test_expect_success '--rebase with rebased upstream' ' git remote add -f me . && git checkout copy && + git tag copy-orig && git reset --hard HEAD^ && echo conflicting modification > file && git commit -m conflict file && git checkout to-rebase && echo file > file2 && git commit -m to-rebase file2 && + git tag to-rebase-orig && git pull --rebase me copy && test "conflicting modification" = "$(cat file)" && test file = $(cat file2) ' +test_expect_success '--rebase with rebased default upstream' ' + + git update-ref refs/remotes/me/copy copy-orig && + git checkout --track -b to-rebase2 me/copy && + git reset --hard to-rebase-orig && + 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 && git update-ref refs/remotes/me/copy copy^ && COPY=$(git rev-parse --verify me/copy) && git rebase --onto $COPY copy && |