diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2021-03-08 17:48:47 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2021-03-08 17:48:47 +0000 |
| commit | 4db15c5b771323f1acdeb06e4acc671856da5ea9 (patch) | |
| tree | 1cde2767753275f2f87a34a2606b2415a467ff09 /pre_commit/commands/run.py | |
| parent | Adding upstream version 2.10.1. (diff) | |
| download | pre-commit-4db15c5b771323f1acdeb06e4acc671856da5ea9.tar.xz pre-commit-4db15c5b771323f1acdeb06e4acc671856da5ea9.zip | |
Adding upstream version 2.11.0.upstream/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' |