Merge branch 'master' into sp/gfi

diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh
index 90eeeba2a31949a84daeb34b1996eaa4818321e6..50c64856f0fd35fd14007e0603a1cf58ce702cec 100755 (executable)
--- a/t/t5510-fetch.sh
+++ b/t/t5510-fetch.sh
@@ -22,14 +22,14 @@ test_expect_success "clone and setup child repos" '
        cd .. &&
        git clone . two &&
        cd two &&
-       git repo-config branch.master.remote one &&
-       git repo-config remote.one.url ../one/.git/ &&
-       git repo-config remote.one.fetch refs/heads/master:refs/heads/one &&
+       git config branch.master.remote one &&
+       git config remote.one.url ../one/.git/ &&
+       git config remote.one.fetch refs/heads/master:refs/heads/one &&
        cd .. &&
        git clone . three &&
        cd three &&
-       git repo-config branch.master.remote two &&
-       git repo-config branch.master.merge refs/heads/one &&
+       git config branch.master.remote two &&
+       git config branch.master.merge refs/heads/one &&
        mkdir -p .git/remotes &&
        {
                echo "URL: ../two/.git/"
@@ -73,7 +73,7 @@ test_expect_success 'fetch following tags' '
 
        mkdir four &&
        cd four &&
-       git init-db &&
+       git init &&
 
        git fetch .. :track &&
        git show-ref --verify refs/tags/anno &&