trivial: use git-repo-config to detect how to run tests in the test repository

trivial: use git-repo-config to detect how to run tests in the test repository

[Alex Riesen]

[-- Attachment #1: Type: text/plain, Size: 49 bytes --]

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>

[-- Attachment #2: 0009-use-git-repo-config-to-detect-how-to-run-the-test-in-the-test-repository.txt --]
[-- Type: text/plain, Size: 1873 bytes --]

Subject: [PATCH] use git-repo-config

to detect how to run the test in the test repository

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>


---

 t/t4006-diff-mode.sh    |   20 +++++++++++++++-----
 t/t4102-apply-rename.sh |    9 +++++++--
 2 files changed, 22 insertions(+), 7 deletions(-)

306a058f3f3d2a8a420ec4de786398ec77b0fc83
diff --git a/t/t4006-diff-mode.sh b/t/t4006-diff-mode.sh
index e2a67e9..8ad69d1 100755
--- a/t/t4006-diff-mode.sh
+++ b/t/t4006-diff-mode.sh
@@ -15,11 +15,21 @@ test_expect_success \
      tree=`git-write-tree` &&
      echo $tree'
 
-test_expect_success \
-    'chmod' \
-    'chmod +x rezrov &&
-     git-update-index rezrov &&
-     git-diff-index $tree >current'
+if [ "$(git repo-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
 
 _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"
diff --git a/t/t4102-apply-rename.sh b/t/t4102-apply-rename.sh
index 0401d7b..fbb508d 100755
--- a/t/t4102-apply-rename.sh
+++ b/t/t4102-apply-rename.sh
@@ -31,7 +31,12 @@ test_expect_success setup \
 test_expect_success apply \
     'git-apply --index --stat --summary --apply test-patch'
 
-test_expect_success validate \
-    'test -f bar && ls -l bar | grep "^-..x......"'
+if [ "$(git repo-config --get core.filemode)" = false ]
+then
+	say 'filemode disabled on the filesystem'
+else
+	test_expect_success validate \
+	    'test -f bar && ls -l bar | grep "^-..x......"'
+fi
 
 test_done
-- 
1.0.GIT