Merge branch 'maint'

diff --git a/t/t6031-merge-recursive.sh b/t/t6031-merge-recursive.sh
index 5bb6b93780273be6504867f07b864e5ea0194e4d..8a3304fb0b5901fb02435d3b77c3d049404f4e25 100755 (executable)
--- a/t/t6031-merge-recursive.sh
+++ b/t/t6031-merge-recursive.sh
@@ -3,6 +3,11 @@
 test_description='merge-recursive: handle file mode'
 . ./test-lib.sh
 
+if ! test "$(git config --bool core.filemode)" = false
+then
+       test_set_prereq FILEMODE
+fi
+
 test_expect_success 'mode change in one branch: keep changed version' '
        : >file1 &&
        git add file1 &&
@@ -12,11 +17,14 @@ test_expect_success 'mode change in one branch: keep changed version' '
        git add dummy &&
        git commit -m a &&
        git checkout -b b1 master &&
-       chmod +x file1 &&
-       git add file1 &&
+       test_chmod +x file1 &&
        git commit -m b1 &&
        git checkout a1 &&
        git merge-recursive master -- a1 b1 &&
+       git ls-files -s file1 | grep ^100755
+'
+
+test_expect_success FILEMODE 'verify executable bit on file' '
        test -x file1
 '
 
@@ -25,8 +33,7 @@ test_expect_success 'mode change in both branches: expect conflict' '
        git checkout -b a2 master &&
        : >file2 &&
        H=$(git hash-object file2) &&
-       chmod +x file2 &&
-       git add file2 &&
+       test_chmod +x file2 &&
        git commit -m a2 &&
        git checkout -b b2 master &&
        : >file2 &&
@@ -42,7 +49,11 @@ test_expect_success 'mode change in both branches: expect conflict' '
                echo "100755 $H 2       file2"
                echo "100644 $H 3       file2"
        ) >expect &&
-       diff -u actual expect &&
+       test_cmp actual expect &&
+       git ls-files -s file2 | grep ^100755
+'
+
+test_expect_success FILEMODE 'verify executable bit on file' '
        test -x file2
 '