Merge branch 'master' of git://repo.or.cz/git-gui

diff --git a/t/t4000-diff-format.sh b/t/t4000-diff-format.sh
index 67b9681d36e187a5717acbf9fe00a7f5dfd5bb65..9c58d77cc22a062e571116e2dee2599ac13cb464 100755 (executable)
--- a/t/t4000-diff-format.sh
+++ b/t/t4000-diff-format.sh
@@ -28,7 +28,7 @@ test_expect_success \
     'git-diff-files -p >current'
 
 # that's as far as it comes
-if [ "$(git repo-config --get core.filemode)" = false ]
+if [ "$(git config --get core.filemode)" = false ]
 then
        say 'filemode disabled on the filesystem'
        test_done