Merge branch 'maint' to synchronize with 1.5.0.6

diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index 2f4ff82e149c497d79583f6b431b29d597e4a1ae..344033249cc1ea3f7066d4d6007ade6cc1a2c5de 100755 (executable)
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -88,7 +88,7 @@ test_expect_success \
 
 test_expect_success "Michael Cassar's test case" '
        rm -fr .git papers partA &&
-       git init-db &&
+       git init &&
        mkdir -p papers/unsorted papers/all-papers partA &&
        echo a > papers/unsorted/Thesis.pdf &&
        echo b > partA/outline.txt &&
@@ -109,7 +109,7 @@ rm -fr papers partA path?
 
 test_expect_success "Sergey Vlasov's test case" '
        rm -fr .git &&
-       git init-db &&
+       git init &&
        mkdir ab &&
        date >ab.c &&
        date >ab/d &&