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/main.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/main.py')
-rw-r--r-- | pre_commit/main.py | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/pre_commit/main.py b/pre_commit/main.py index ce850c4..c66cfb9 100644 --- a/pre_commit/main.py +++ b/pre_commit/main.py @@ -67,8 +67,8 @@ class AppendReplaceDefault(argparse.Action): def _add_hook_type_option(parser: argparse.ArgumentParser) -> None: parser.add_argument( '-t', '--hook-type', choices=( - 'pre-commit', 'pre-merge-commit', 'pre-push', - 'prepare-commit-msg', 'commit-msg', 'post-commit', 'post-checkout', + 'pre-commit', 'pre-merge-commit', 'pre-push', 'prepare-commit-msg', + 'commit-msg', 'post-commit', 'post-checkout', 'post-merge', ), action=AppendReplaceDefault, default=['pre-commit'], @@ -136,6 +136,13 @@ def _add_run_options(parser: argparse.ArgumentParser) -> None: 'file from the index, flag=0).' ), ) + parser.add_argument( + '--is-squash-merge', + help=( + 'During a post-merge hook, indicates whether the merge was a ' + 'squash merge' + ), + ) def _adjust_args_and_chdir(args: argparse.Namespace) -> None: |