Merge branch 'cc/maint-commit-reflog-msg'

diff --git a/t/t5521-pull-options.sh b/t/t5521-pull-options.sh
index 84059d82d5061870e6932a4d82327110b4c89875..1b06691bb41586b3bc564841b720ce710f927a1c 100755 (executable)
--- a/t/t5521-pull-options.sh
+++ b/t/t5521-pull-options.sh
@@ -72,4 +72,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