Merge branch 'jc/maint-checkout-fix' into maint

diff --git a/t/t6031-merge-recursive.sh b/t/t6031-merge-recursive.sh
index c8310aee4f77e19281b2559c1f52804c7c98a81d..8073e0c3efb2ac01e4a81e722fc357bcab13f5d4 100755 (executable)
--- a/t/t6031-merge-recursive.sh
+++ b/t/t6031-merge-recursive.sh
@@ -3,6 +3,9 @@
 test_description='merge-recursive: handle file mode'
 . ./test-lib.sh
 
+# Note that we follow "chmod +x F" with "update-index --chmod=+x F" to
+# help filesystems that do not have the executable bit.
+
 test_expect_success 'mode change in one branch: keep changed version' '
        : >file1 &&
        git add file1 &&
@@ -13,7 +16,7 @@ test_expect_success 'mode change in one branch: keep changed version' '
        git commit -m a &&
        git checkout -b b1 master &&
        chmod +x file1 &&
-       git add file1 &&
+       git update-index --chmod=+x file1 &&
        git commit -m b1 &&
        git checkout a1 &&
        git merge-recursive master -- a1 b1 &&
@@ -26,7 +29,7 @@ test_expect_success 'mode change in both branches: expect conflict' '
        : >file2 &&
        H=$(git hash-object file2) &&
        chmod +x file2 &&
-       git add file2 &&
+       git update-index --add --chmod=+x file2 &&
        git commit -m a2 &&
        git checkout -b b2 master &&
        : >file2 &&