aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Tony Wasserka <neobrainx@gmail.com>2015-07-14 14:19:29 +0200
committerGravatar Tony Wasserka <neobrainx@gmail.com>2015-07-14 14:19:29 +0200
commit7673cdfdaef2e61f872bb18e1ca26af4eac4feda (patch)
tree559deaf95d0bd43e931ad332af175b6d44613802
parent04cb7ae6019402f1b53cea1beb5117d67628bce7 (diff)
parent256eb24777fcc082a462ce55aed9eb852a20439a (diff)
Merge pull request #928 from JSFernandes/master
Fix permissions in pre-commit hook.
-rw-r--r--CMakeLists.txt3
-rwxr-xr-x[-rw-r--r--]hooks/pre-commit0
2 files changed, 1 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 59f76fa9..e945a667 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,8 +7,7 @@ project(citra)
if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git/hooks/pre-commit)
message(STATUS "Copying pre-commit hook")
file(COPY hooks/pre-commit
- DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/.git/hooks
- FILE_PERMISSIONS WORLD_EXECUTE )
+ DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/.git/hooks)
endif()
if (NOT MSVC)
diff --git a/hooks/pre-commit b/hooks/pre-commit
index bad84b14..bad84b14 100644..100755
--- a/hooks/pre-commit
+++ b/hooks/pre-commit