Skip to content

Commit

Permalink
Merge pull request #92204 from akien-mga/pre-commit-downstream-hooks
Browse files Browse the repository at this point in the history
Pre-commit: Allow adding downstream hooks without (less) risk of conflicts
  • Loading branch information
akien-mga committed May 21, 2024
2 parents 4c0d5e5 + 00e52d9 commit 9d792dd
Showing 1 changed file with 13 additions and 0 deletions.
13 changes: 13 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@ repos:
exclude: |
(?x)^(
core/math/bvh_.*\.inc$|
platform/(?!android|ios|linuxbsd|macos|web|windows)\w+/.*|
platform/android/java/lib/src/com/.*|
platform/android/java/lib/src/org/godotengine/godot/gl/GLSurfaceView\.java$|
platform/android/java/lib/src/org/godotengine/godot/gl/EGLLogWrapper\.java$|
Expand Down Expand Up @@ -186,3 +187,15 @@ repos:
language: python
entry: python3 misc/scripts/dotnet_format.py
types_or: [c#]

# End of upstream Godot pre-commit hooks.
#
# Keep this separation to let downstream forks add their own hooks to this file,
# without running into merge conflicts when rebasing on latest upstream.
#
# Start of downstream pre-commit hooks.
#
# This is still the "repo: local" scope, so new local hooks can be defined directly at this indentation:
# - id: new-local-hook
# To add external repo hooks, bring the indentation back to:
# - repo: my-remote-hook

0 comments on commit 9d792dd

Please sign in to comment.