Browse Source

Merge pull request #65078 from RandomShaper/git_hooks_extend

Rémi Verschelde 3 years ago
parent
commit
08eafbd52b
3 changed files with 7 additions and 1 deletions
  1. 1 0
      .gitignore
  2. 5 0
      misc/hooks/README.md
  3. 1 1
      misc/hooks/pre-commit

+ 1 - 0
.gitignore

@@ -23,6 +23,7 @@
 ###########################
 ###########################
 
 
 /custom.py
 /custom.py
+misc/hooks/pre-commit-custom-*
 
 
 #############################
 #############################
 ### Godot generated files ###
 ### Godot generated files ###

+ 5 - 0
misc/hooks/README.md

@@ -35,3 +35,8 @@ so they should work out of the box on Linux/macOS.
 ##### black
 ##### black
 - Python installation: make sure Python is added to the `PATH`
 - Python installation: make sure Python is added to the `PATH`
 - Install `black` - in any console: `pip3 install black`
 - Install `black` - in any console: `pip3 install black`
+
+## Custom hooks
+
+The pre-commit hook will run any other script in `.git/hooks` whose filename
+matches `pre-commit-custom-*`, after the Godot ones.

+ 1 - 1
misc/hooks/pre-commit

@@ -13,8 +13,8 @@
 # pre-commit hooks to be executed. They should be in the same .git/hooks/ folder
 # pre-commit hooks to be executed. They should be in the same .git/hooks/ folder
 # as this script. Hooks should return 0 if successful and nonzero to cancel the
 # as this script. Hooks should return 0 if successful and nonzero to cancel the
 # commit. They are executed in the order in which they are listed.
 # commit. They are executed in the order in which they are listed.
-#HOOKS="pre-commit-compile pre-commit-uncrustify"
 HOOKS="pre-commit-clang-format pre-commit-black pre-commit-make-rst"
 HOOKS="pre-commit-clang-format pre-commit-black pre-commit-make-rst"
+HOOKS="$HOOKS $(find $(dirname -- "$0") -type f -name 'pre-commit-custom-*' -exec basename {} \;)"
 ###########################################################
 ###########################################################
 # There should be no need to change anything below this line.
 # There should be no need to change anything below this line.