diff options
| author |  Tony Wasserka | 2015-07-14 14:19:29 +0200 |
|---|---|---|
| committer | Tony Wasserka | 2015-07-14 14:19:29 +0200 |
| commit | 7673cdfdaef2e61f872bb18e1ca26af4eac4feda (patch) | |
| tree | 559deaf95d0bd43e931ad332af175b6d44613802 | |
| parent | Merge pull request #767 from Lectem/DOT3_RGB (diff) | |
| parent | Fix permissions in pre-commit hook (diff) | |
| download | yuzu-7673cdfdaef2e61f872bb18e1ca26af4eac4feda.tar.gz yuzu-7673cdfdaef2e61f872bb18e1ca26af4eac4feda.tar.xz yuzu-7673cdfdaef2e61f872bb18e1ca26af4eac4feda.zip | |
Merge pull request #928 from JSFernandes/master
Fix permissions in pre-commit hook.
Diffstat (limited to '')
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rwxr-xr-x[-rw-r--r--] | hooks/pre-commit | 0 |
2 files changed, 1 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 59f76fa93..e945a6679 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -7,8 +7,7 @@ project(citra) | |||
| 7 | if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git/hooks/pre-commit) | 7 | if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git/hooks/pre-commit) |
| 8 | message(STATUS "Copying pre-commit hook") | 8 | message(STATUS "Copying pre-commit hook") |
| 9 | file(COPY hooks/pre-commit | 9 | file(COPY hooks/pre-commit |
| 10 | DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/.git/hooks | 10 | DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/.git/hooks) |
| 11 | FILE_PERMISSIONS WORLD_EXECUTE ) | ||
| 12 | endif() | 11 | endif() |
| 13 | 12 | ||
| 14 | if (NOT MSVC) | 13 | if (NOT MSVC) |
diff --git a/hooks/pre-commit b/hooks/pre-commit index bad84b14b..bad84b14b 100644..100755 --- a/hooks/pre-commit +++ b/hooks/pre-commit | |||