Merge branch 'jk/maint-1.6.0-trace-argv'

diff --git a/t/t4006-diff-mode.sh b/t/t4006-diff-mode.sh
index 4e92fce1d00a55cfbc39e55b53f95cc309e96ff2..8c1b81e248bced2ccb5e4ff0067996462e89deb8 100755 (executable)
--- a/t/t4006-diff-mode.sh
+++ b/t/t4006-diff-mode.sh
@@ -15,21 +15,10 @@ test_expect_success \
      tree=`git write-tree` &&
      echo $tree'
 
-if [ "$(git config --get core.filemode)" = false ]
-then
-       say 'filemode disabled on the filesystem, using update-index --chmod=+x'
-       test_expect_success \
-           'git update-index --chmod=+x' \
-           'git update-index rezrov &&
-            git update-index --chmod=+x rezrov &&
-            git diff-index $tree >current'
-else
-       test_expect_success \
-           'chmod' \
-           'chmod +x rezrov &&
-            git update-index rezrov &&
-            git diff-index $tree >current'
-fi
+test_expect_success \
+    'chmod' \
+    'test_chmod +x rezrov &&
+     git diff-index $tree >current'
 
 _x40='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]'
 _x40="$_x40$_x40$_x40$_x40$_x40$_x40$_x40$_x40"