Merge branch 'maint' to synchronize with 1.5.0.6

diff --git a/t/t4116-apply-reverse.sh b/t/t4116-apply-reverse.sh
index 74f5c2a5755c8d29045498031c0bc3721a00b9c7..2685b2263017df96159542853b373ea261880ba4 100755 (executable)
--- a/t/t4116-apply-reverse.sh
+++ b/t/t4116-apply-reverse.sh
@@ -42,7 +42,7 @@ test_expect_success 'apply in reverse' '
        git reset --hard second &&
        git apply --reverse --binary --index patch &&
        git diff >diff &&
-       diff -u /dev/null diff
+       git diff /dev/null diff
 
 '
 
@@ -50,12 +50,12 @@ test_expect_success 'setup separate repository lacking postimage' '
 
        git tar-tree initial initial | tar xf - &&
        (
-               cd initial && git init-db && git add .
+               cd initial && git init && git add .
        ) &&
 
        git tar-tree second second | tar xf - &&
        (
-               cd second && git init-db && git add .
+               cd second && git init && git add .
        )
 
 '