diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-04-26 18:00:14 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-26 18:00:14 (GMT) |
| commit | bcd660871a85d8661cbac1efd01d42517420df79 (patch) | |
| tree | 7b6e863108c1085004f3fd83019b86c49e6d4707 /t | |
| parent | a8addfecf08ab9e3832eeac3f574fd0637a2970c (diff) | |
| parent | ce4c4d4ec3df274349f20431c61ed85cea038026 (diff) | |
| download | git-bcd660871a85d8661cbac1efd01d42517420df79.zip git-bcd660871a85d8661cbac1efd01d42517420df79.tar.gz git-bcd660871a85d8661cbac1efd01d42517420df79.tar.bz2 | |
Merge branch 'pe/pull-rebase-v-q' into maint
* pe/pull-rebase-v-q:
pull: Apply -q and -v options to rebase mode as well
Diffstat (limited to 't')
| -rwxr-xr-x | t/t5521-pull-options.sh | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/t/t5521-pull-options.sh b/t/t5521-pull-options.sh index 1b06691..aa31abe 100755 --- a/t/t5521-pull-options.sh +++ b/t/t5521-pull-options.sh @@ -19,6 +19,17 @@ test_expect_success 'git pull -q' ' 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 && @@ -27,6 +38,14 @@ test_expect_success 'git pull' ' 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 && @@ -35,6 +54,14 @@ test_expect_success 'git pull -v' ' 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 && |