Merge branch 'maint' to synchronize with 1.5.0.6

diff --git a/t/t4006-diff-mode.sh b/t/t4006-diff-mode.sh
index 8ad69d11155f3a3df9a5508a07ccd78ba7e5d747..e72c6fd1b4fa294e3e52fe55ab68c672bfc57e15 100755 (executable)
--- a/t/t4006-diff-mode.sh
+++ b/t/t4006-diff-mode.sh
@@ -15,7 +15,7 @@ test_expect_success \
      tree=`git-write-tree` &&
      echo $tree'
 
-if [ "$(git repo-config --get core.filemode)" = false ]
+if [ "$(git config --get core.filemode)" = false ]
 then
        say 'filemode disabled on the filesystem, using update-index --chmod=+x'
        test_expect_success \
@@ -38,7 +38,7 @@ echo ":100644 100755 X X M    rezrov" >expected
 
 test_expect_success \
     'verify' \
-    'diff -u expected check'
+    'git diff expected check'
 
 test_done