diff options
| author | Lectem <lectem@gmail.com> | 2015-05-31 13:24:23 +0200 |
|---|---|---|
| committer | Lectem <lectem@gmail.com> | 2015-06-09 19:59:39 +0200 |
| commit | 85183a702ab342de03d7a8d7b73e1fb0f7e346f2 (patch) | |
| tree | 4fcf5606b0a3d564ef62e28ec13aee70b5fdb5f1 | |
| parent | Merge pull request #805 from lioncash/warn (diff) | |
| download | yuzu-85183a702ab342de03d7a8d7b73e1fb0f7e346f2.tar yuzu-85183a702ab342de03d7a8d7b73e1fb0f7e346f2.tar.gz yuzu-85183a702ab342de03d7a8d7b73e1fb0f7e346f2.tar.bz2 yuzu-85183a702ab342de03d7a8d7b73e1fb0f7e346f2.tar.lz yuzu-85183a702ab342de03d7a8d7b73e1fb0f7e346f2.tar.xz yuzu-85183a702ab342de03d7a8d7b73e1fb0f7e346f2.tar.zst yuzu-85183a702ab342de03d7a8d7b73e1fb0f7e346f2.zip | |
| -rw-r--r-- | .gitconfig | 2 | ||||
| -rw-r--r-- | CMakeLists.txt | 7 | ||||
| -rw-r--r-- | hooks/pre-commit | 23 |
3 files changed, 32 insertions, 0 deletions
diff --git a/.gitconfig b/.gitconfig new file mode 100644 index 000000000..4cab7f2d9 --- /dev/null +++ b/.gitconfig @@ -0,0 +1,2 @@ +[core] + whitespace = blank-at-eol,trailing-space,tab-in-indent diff --git a/CMakeLists.txt b/CMakeLists.txt index fc742317c..d958dfc35 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,6 +4,13 @@ cmake_minimum_required(VERSION 2.8.11) 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 ) +endif() + if (NOT MSVC) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wno-attributes -pthread") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pthread") diff --git a/hooks/pre-commit b/hooks/pre-commit new file mode 100644 index 000000000..44010fa1a --- /dev/null +++ b/hooks/pre-commit @@ -0,0 +1,23 @@ +#!/bin/sh + +#check the config, in case the user really wants to allow tabs... +allowtabs=$(git config hooks.allowtabs) +if [ "$allowtabs" != "true" ] && + git diff --cached | egrep '^\+.* ' +then + cat<<END; +Error: This commit would contain a tab, which is against this repo's policy. +END + exit 1 +fi + +# If there are whitespace errors, print the offending file names and fail. +if +# Use git built-in checks for trailing whitespaces + ! git diff --check --cached +then + cat<<END; +Error: This commit would contain trailing spaces, which is against this repo's policy. +END + exit 1 +fi |