| test_description='merge-recursive: handle file mode' |
| if ! test "$(git config --bool core.filemode)" = false |
| test_expect_success 'mode change in one branch: keep changed version' ' |
| git checkout -b a1 master && |
| git checkout -b b1 master && |
| git merge-recursive master -- a1 b1 && |
| git ls-files -s file1 | grep ^100755 |
| test_expect_success FILEMODE 'verify executable bit on file' ' |
| test_expect_success 'mode change in both branches: expect conflict' ' |
| git checkout -b a2 master && |
| H=$(git hash-object file2) && |
| git checkout -b b2 master && |
| git merge-recursive master -- a2 b2 |
| git ls-files -u >actual && |
| test_cmp actual expect && |
| git ls-files -s file2 | grep ^100755 |
| test_expect_success FILEMODE 'verify executable bit on file' ' |