From cb089343c8253fdeec7853be5ff0cb1dab1a132d Mon Sep 17 00:00:00 2001 From: squidfunk Date: Fri, 28 Dec 2018 19:01:18 +0100 Subject: [PATCH] Removed git-hooks --- .githooks/commit-msg/skip.sh | 54 ----------------------------- .githooks/post-merge/install.sh | 30 ---------------- .githooks/pre-commit/check.sh | 61 --------------------------------- package-lock.json | 8 +---- package.json | 1 - 5 files changed, 1 insertion(+), 153 deletions(-) delete mode 100755 .githooks/commit-msg/skip.sh delete mode 100755 .githooks/post-merge/install.sh delete mode 100755 .githooks/pre-commit/check.sh diff --git a/.githooks/commit-msg/skip.sh b/.githooks/commit-msg/skip.sh deleted file mode 100755 index bc5daf135..000000000 --- a/.githooks/commit-msg/skip.sh +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2016-2018 Martin Donath - -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to -# deal in the Software without restriction, including without limitation the -# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -# sell copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: - -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. - -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -# IN THE SOFTWARE. - -# Exit, if there's no .travisignore file -if [[ ! -a .travisignore ]]; then - exit -fi - -# Filter relevant files for linting -FILES=$(git diff --cached --name-only) - -# Resolve the patterns we want to skip -BLACKLIST=$(< .travisignore) - -# Remove the pattern from the list of changes -for f in $BLACKLIST; do - FILES=( ${FILES[@]/$f/} ) - - # If we've exhausted the list of changes before we've finished going - # through patterns, that's okay, just quit the loop - if [[ ${#FILES[@]} -eq 0 ]]; then - break - fi -done - -# If there's changes left, then we have stuff to build, leave the commit alone -if [[ ${#FILES[@]} -gt 0 ]]; then - exit -fi - -# Don't build this commit -sed -i '' '1s/$/ [ci skip]/' "$1" - -# We're good -exit 0 diff --git a/.githooks/post-merge/install.sh b/.githooks/post-merge/install.sh deleted file mode 100755 index 77c209d7c..000000000 --- a/.githooks/post-merge/install.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2016-2018 Martin Donath - -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to -# deal in the Software without restriction, including without limitation the -# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -# sell copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: - -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. - -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -# IN THE SOFTWARE. - -# Check, if all changes are added to the index -CHANGED="$(git diff-tree -r --name-only --no-commit-id ORIG_HEAD HEAD)" - -# Perform install and prune of NPM dependencies if package.json changed -if $(echo "$CHANGED" | grep --quiet package.json); then - echo -e "\x1B[33m!\x1B[0m Updating dependencies" - npm install -fi diff --git a/.githooks/pre-commit/check.sh b/.githooks/pre-commit/check.sh deleted file mode 100755 index 84db09095..000000000 --- a/.githooks/pre-commit/check.sh +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2016-2018 Martin Donath - -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to -# deal in the Software without restriction, including without limitation the -# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -# sell copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: - -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. - -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -# IN THE SOFTWARE. - -# Patch file to store unindexed changes -PATCH_FILE=".working-tree.patch" -MESSAGE="Terminated with errors" - -# Revert changes that have been registered in the patch file -function cleanup { - EXIT_CODE=$? - if [ -f "$PATCH_FILE" ]; then - git apply "$PATCH_FILE" 2> /dev/null - rm "$PATCH_FILE" - fi - exit $EXIT_CODE -} - -# Register signal handlers -trap cleanup EXIT SIGINT SIGHUP - -# Cancel any changes to the working tree that are not going to be committed -git diff > "$PATCH_FILE" -git checkout -- . - -# Filter relevant files for linting -FILES=$(git diff --cached --name-only --diff-filter=ACMR | \ - grep "\.\(js\|jsx\|scss\)$") - -# Run check and print indicator -if [ "$FILES" ]; then - - # If linter terminated with errors, abort commit - if [ $? -gt 0 ]; then - echo -e "\x1B[31m✗\x1B[0m Linter - \x1B[31m$MESSAGE\x1B[0m" - exit 1 - else - echo -e "\x1B[32m✓\x1B[0m Linter" - fi -fi - -# We're good -exit 0 diff --git a/package-lock.json b/package-lock.json index 07f44cae4..42a51298c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "mkdocs-material", - "version": "3.1.0", + "version": "3.2.0", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -6508,12 +6508,6 @@ "logalot": "^2.0.0" } }, - "git-hooks": { - "version": "1.1.10", - "resolved": "https://registry.npmjs.org/git-hooks/-/git-hooks-1.1.10.tgz", - "integrity": "sha512-23nto1qLsqJdY0daAUYqeKPyTvzefR2wZv1krgFRnPg0FxrmITCeWAIv/QfR+fAD7eZC7Rp5OSicJB4hDKyp1A==", - "dev": true - }, "glob": { "version": "7.1.3", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz", diff --git a/package.json b/package.json index 36e4fdc63..f47fd8a03 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,6 @@ "extract-loader": "^3.1.0", "fastclick": "^1.0.6", "file-loader": "^3.0.1", - "git-hooks": "^1.1.8", "html-minifier": "^3.5.6", "imagemin-webpack-plugin": "^2.0.0", "js-cookie": "^2.1.4",