diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2021-03-08 17:48:51 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2021-03-08 17:49:10 +0000 |
| commit | 84c011ae6133fb007046d8eb66c01d0de80b3500 (patch) | |
| tree | 60b2be37885c99f0bf69434223b01cc5a2b92203 /pre_commit/commands/run.py | |
| parent | Releasing debian version 2.10.1-1. (diff) | |
| download | pre-commit-84c011ae6133fb007046d8eb66c01d0de80b3500.tar.xz pre-commit-84c011ae6133fb007046d8eb66c01d0de80b3500.zip | |
Merging upstream version 2.11.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'pre_commit/commands/run.py')
| -rw-r--r-- | pre_commit/commands/run.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pre_commit/commands/run.py b/pre_commit/commands/run.py index 891488d..05c3268 100644 --- a/pre_commit/commands/run.py +++ b/pre_commit/commands/run.py @@ -245,7 +245,7 @@ def _compute_cols(hooks: Sequence[Hook]) -> int: def _all_filenames(args: argparse.Namespace) -> Collection[str]: # these hooks do not operate on files - if args.hook_stage in {'post-checkout', 'post-commit'}: + if args.hook_stage in {'post-checkout', 'post-commit', 'post-merge'}: return () elif args.hook_stage in {'prepare-commit-msg', 'commit-msg'}: return (args.commit_msg_filename,) @@ -379,6 +379,9 @@ def run( if args.checkout_type: environ['PRE_COMMIT_CHECKOUT_TYPE'] = args.checkout_type + if args.is_squash_merge: + environ['PRE_COMMIT_IS_SQUASH_MERGE'] = args.is_squash_merge + # Set pre_commit flag environ['PRE_COMMIT'] = '1' |