pre-commit: add `check-case-conflict` and `check-merge-conflict` (#117259)

This commit is contained in:
Hugo van Kemenade 2024-03-26 16:09:09 +02:00 committed by GitHub
parent 4abca7e1e7
commit 743f2c68f4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 1 deletions

View File

@ -1,6 +1,6 @@
repos: repos:
- repo: https://github.com/astral-sh/ruff-pre-commit - repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.2.0 rev: v0.3.4
hooks: hooks:
- id: ruff - id: ruff
name: Run Ruff on Lib/test/ name: Run Ruff on Lib/test/
@ -14,6 +14,8 @@ repos:
- repo: https://github.com/pre-commit/pre-commit-hooks - repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.5.0 rev: v4.5.0
hooks: hooks:
- id: check-case-conflict
- id: check-merge-conflict
- id: check-toml - id: check-toml
exclude: ^Lib/test/test_tomllib/ exclude: ^Lib/test/test_tomllib/
- id: check-yaml - id: check-yaml