| #!/bin/sh |
| |
| test_description='pull options' |
| |
| . ./test-lib.sh |
| |
| test_expect_success 'setup' ' |
| mkdir parent && |
| (cd parent && git init && |
| echo one >file && git add file && |
| git commit -m one) |
| ' |
| |
| test_expect_success 'git pull -q' ' |
| mkdir clonedq && |
| (cd clonedq && git init && |
| git pull -q "../parent" >out 2>err && |
| test ! -s err && |
| test ! -s out) |
| ' |
| |
| test_expect_success 'git pull -q --rebase' ' |
| mkdir clonedqrb && |
| (cd clonedqrb && git init && |
| git pull -q --rebase "../parent" >out 2>err && |
| test ! -s err && |
| test ! -s out && |
| git pull -q --rebase "../parent" >out 2>err && |
| test ! -s err && |
| test ! -s out) |
| ' |
| |
| test_expect_success 'git pull' ' |
| mkdir cloned && |
| (cd cloned && git init && |
| git pull "../parent" >out 2>err && |
| test -s err && |
| test ! -s out) |
| ' |
| |
| test_expect_success 'git pull --rebase' ' |
| mkdir clonedrb && |
| (cd clonedrb && git init && |
| git pull --rebase "../parent" >out 2>err && |
| test -s err && |
| test ! -s out) |
| ' |
| |
| test_expect_success 'git pull -v' ' |
| mkdir clonedv && |
| (cd clonedv && git init && |
| git pull -v "../parent" >out 2>err && |
| test -s err && |
| test ! -s out) |
| ' |
| |
| test_expect_success 'git pull -v --rebase' ' |
| mkdir clonedvrb && |
| (cd clonedvrb && git init && |
| git pull -v --rebase "../parent" >out 2>err && |
| test -s err && |
| test ! -s out) |
| ' |
| |
| test_expect_success 'git pull -v -q' ' |
| mkdir clonedvq && |
| (cd clonedvq && git init && |
| git pull -v -q "../parent" >out 2>err && |
| test ! -s out && |
| test ! -s err) |
| ' |
| |
| test_expect_success 'git pull -q -v' ' |
| mkdir clonedqv && |
| (cd clonedqv && git init && |
| git pull -q -v "../parent" >out 2>err && |
| test ! -s out && |
| test -s err) |
| ' |
| |
| test_expect_success 'git pull --force' ' |
| mkdir clonedoldstyle && |
| (cd clonedoldstyle && git init && |
| cat >>.git/config <<-\EOF && |
| [remote "one"] |
| url = ../parent |
| fetch = refs/heads/master:refs/heads/mirror |
| [remote "two"] |
| url = ../parent |
| fetch = refs/heads/master:refs/heads/origin |
| [branch "master"] |
| remote = two |
| merge = refs/heads/master |
| EOF |
| git pull two && |
| test_commit A && |
| git branch -f origin && |
| git pull --all --force |
| ) |
| ' |
| |
| test_expect_success 'git pull --all' ' |
| mkdir clonedmulti && |
| (cd clonedmulti && git init && |
| cat >>.git/config <<-\EOF && |
| [remote "one"] |
| url = ../parent |
| fetch = refs/heads/*:refs/remotes/one/* |
| [remote "two"] |
| url = ../parent |
| fetch = refs/heads/*:refs/remotes/two/* |
| [branch "master"] |
| remote = one |
| merge = refs/heads/master |
| EOF |
| git pull --all |
| ) |
| ' |
| |
| test_done |