Merge branch 'maint' to synchronize with 1.5.0.6

diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index 23a1eff3bba4505d449bd5fdffb3daf7f9b23ddf..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 &&
@@ -105,4 +105,17 @@ test_expect_success "Michael Cassar's test case" '
        }
 '
 
+rm -fr papers partA path?
+
+test_expect_success "Sergey Vlasov's test case" '
+       rm -fr .git &&
+       git init &&
+       mkdir ab &&
+       date >ab.c &&
+       date >ab/d &&
+       git add ab.c ab &&
+       git commit -m 'initial' &&
+       git mv ab a
+'
+
 test_done