Merge branch 'pb/remote-mirror-config'

diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
index 38a90adad6874d0073059da542835df210172938..cb5f7a444175938c8a9cc4c029b41b7325b91618 100755 (executable)
--- a/t/t3200-branch.sh
+++ b/t/t3200-branch.sh
@@ -153,16 +153,6 @@ test_expect_success 'test tracking setup via config' \
      test $(git config branch.my3.remote) = local &&
      test $(git config branch.my3.merge) = refs/heads/master'
 
-test_expect_success 'avoid ambiguous track' '
-       git config branch.autosetupmerge true &&
-       git config remote.ambi1.url = lalala &&
-       git config remote.ambi1.fetch = refs/heads/lalala:refs/heads/master &&
-       git config remote.ambi2.url = lilili &&
-       git config remote.ambi2.fetch = refs/heads/lilili:refs/heads/master &&
-       git branch all1 master &&
-       test -z "$(git config branch.all1.merge)"
-'
-
 test_expect_success 'test overriding tracking setup via --no-track' \
     'git config branch.autosetupmerge true &&
      git config remote.local.url . &&
@@ -224,4 +214,14 @@ test_expect_success \
         test -f .git/logs/refs/heads/g/h/i &&
         diff expect .git/logs/refs/heads/g/h/i'
 
+test_expect_success 'avoid ambiguous track' '
+       git config branch.autosetupmerge true &&
+       git config remote.ambi1.url lalala &&
+       git config remote.ambi1.fetch refs/heads/lalala:refs/heads/master &&
+       git config remote.ambi2.url lilili &&
+       git config remote.ambi2.fetch refs/heads/lilili:refs/heads/master &&
+       git branch all1 master &&
+       test -z "$(git config branch.all1.merge)"
+'
+
 test_done