Merge pull request #1881 from adamchainz/issue_1880_patch_naming

asottile · web-flow · commit 52ada7c614b3 · 2021-04-16T14:12:38.000-07:00
Include PID in patch filename
diff --git a/pre_commit/staged_files_only.py b/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}.')

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ def _unstaged_changes_cleared(patch_dir: str) -> Generator[None, None, None]:`
`47`	`47`	`retcode=None,`
`48`	`48`	`)`
`49`	`49`	`if retcode and diff_stdout_binary.strip():`
`50`		`- patch_filename = f'patch{int(time.time())}'`
	`50`	`+ patch_filename = f'patch{int(time.time())}-{os.getpid()}'`
`51`	`51`	`patch_filename = os.path.join(patch_dir, patch_filename)`
`52`	`52`	`logger.warning('Unstaged files detected.')`
`53`	`53`	`logger.info(f'Stashing unstaged files to {patch_filename}.')`