Merge branch 'ph/maint-submodule-status-fix'

diff --git a/t/t5521-pull-options.sh b/t/t5521-pull-options.sh
index 83e2e8ab800a2f664085b7350272727748512e42..1b06691bb41586b3bc564841b720ce710f927a1c 100755 (executable)
--- a/t/t5521-pull-options.sh
+++ b/t/t5521-pull-options.sh
@@ -4,8 +4,6 @@ test_description='pull options'
 
 . ./test-lib.sh
 
-D=`pwd`
-
 test_expect_success 'setup' '
        mkdir parent &&
        (cd parent && git init &&
@@ -13,48 +11,83 @@ test_expect_success 'setup' '
         git commit -m one)
 '
 
-cd "$D"
-
 test_expect_success 'git pull -q' '
        mkdir clonedq &&
-       cd clonedq &&
-       git pull -q "$D/parent" >out 2>err &&
-       test ! -s out
+       (cd clonedq && git init &&
+       git pull -q "../parent" >out 2>err &&
+       test ! -s err &&
+       test ! -s out)
 '
 
-cd "$D"
-
 test_expect_success 'git pull' '
        mkdir cloned &&
-       cd cloned &&
-       git pull "$D/parent" >out 2>err &&
-       test -s out
+       (cd cloned && git init &&
+       git pull "../parent" >out 2>err &&
+       test -s err &&
+       test ! -s out)
 '
-cd "$D"
 
 test_expect_success 'git pull -v' '
        mkdir clonedv &&
-       cd clonedv &&
-       git pull -v "$D/parent" >out 2>err &&
-       test -s out
+       (cd clonedv && git init &&
+       git pull -v "../parent" >out 2>err &&
+       test -s err &&
+       test ! -s out)
 '
 
-cd "$D"
-
 test_expect_success 'git pull -v -q' '
        mkdir clonedvq &&
-       cd clonedvq &&
-       git pull -v -q "$D/parent" >out 2>err &&
-       test ! -s out
+       (cd clonedvq && git init &&
+       git pull -v -q "../parent" >out 2>err &&
+       test ! -s out &&
+       test ! -s err)
 '
 
-cd "$D"
-
 test_expect_success 'git pull -q -v' '
        mkdir clonedqv &&
-       cd clonedqv &&
-       git pull -q -v "$D/parent" >out 2>err &&
-       test -s out
+       (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