Adding upstream version 2.12.1.

Signed-off-by: Daniel Baumann <daniel@debian.org>

.pre-commit-config.yaml

@@ -21,11 +21,11 @@ repos:
     hooks:
     -   id: autopep8
 -   repo: https://github.com/pre-commit/pre-commit
-    rev: v2.12.0
+    rev: v2.12.1
     hooks:
     -   id: validate_manifest
 -   repo: https://github.com/asottile/pyupgrade
-    rev: v2.11.0
+    rev: v2.12.0
     hooks:
     -   id: pyupgrade
         args: [--py36-plus]

CHANGELOG.md

@@ -1,3 +1,11 @@
+2.12.1 - 2021-04-16
+===================
+
+### Fixes
+- Fix race condition when stashing files in multiple parallel invocations
+    - #1881 PR by @adamchainz.
+    - #1880 issue by @adamchainz.
+
 2.12.0 - 2021-04-06
 ===================
 

azure-pipelines.yml

@@ -10,7 +10,7 @@ resources:
       type: github
       endpoint: github
       name: asottile/azure-pipeline-templates
-      ref: refs/tags/v2.0.0
+      ref: refs/tags/v2.1.0
 
 jobs:
 - template: job--python-tox.yml@asottile

pre_commit/staged_files_only.py

@@ -47,7 +47,7 @@ def _unstaged_changes_cleared(patch_dir: str) -> Generator[None, None, None]:
         retcode=None,
     )
     if retcode and diff_stdout_binary.strip():
-        patch_filename = f'patch{int(time.time())}'
+        patch_filename = f'patch{int(time.time())}-{os.getpid()}'
         patch_filename = os.path.join(patch_dir, patch_filename)
         logger.warning('Unstaged files detected.')
         logger.info(f'Stashing unstaged files to {patch_filename}.')

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = pre_commit
-version = 2.12.0
+version = 2.12.1
 description = A framework for managing and maintaining multi-language pre-commit hooks.
 long_description = file: README.md
 long_description_content_type = text/markdown