Merge branch 'pe/pull-rebase-v-q'

diff --git a/t/t5521-pull-options.sh b/t/t5521-pull-options.sh
index 84059d82d5061870e6932a4d82327110b4c89875..aa31abe32b3abc1b43d8111f6503313aa8237455 100755 (executable)
--- 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 &&
@@ -72,4 +99,22 @@ test_expect_success 'git pull --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