wip: support pre-merge-commit

pre-commit · Nov 7, 2019 · 3ad1264 · 3ad1264
1 parent 0fd4a2e
commit 3ad1264
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/pre_commit/constants.py b/pre_commit/constants.py
@@ -26,6 +26,9 @@
 VERSION = importlib_metadata.version('pre_commit')
 
 # `manual` is not invoked by any installed git hook.  See #719
-STAGES = ('commit', 'prepare-commit-msg', 'commit-msg', 'manual', 'push')
+STAGES = (
+    'commit', 'merge-commit', 'prepare-commit-msg', 'commit-msg', 'manual',
+    'push',
+)
 
 DEFAULT = 'default'
diff --git a/pre_commit/main.py b/pre_commit/main.py
@@ -70,7 +70,8 @@ def __call__(self, parser, namespace, values, option_string=None):
 def _add_hook_type_option(parser):
     parser.add_argument(
         '-t', '--hook-type', choices=(
-            'pre-commit', 'pre-push', 'prepare-commit-msg', 'commit-msg',
+            'pre-commit', 'pre-merge-commit', 'pre-push',
+            'prepare-commit-msg', 'commit-msg',
         ),
         action=AppendReplaceDefault,
         default=['pre-commit'],

diff --git a/pre_commit/resources/hook-tmpl b/pre_commit/resources/hook-tmpl
@@ -163,6 +163,7 @@ def _opts(stdin):
     fns = {
         'prepare-commit-msg': lambda _: ('--commit-msg-filename', sys.argv[1]),
         'commit-msg': lambda _: ('--commit-msg-filename', sys.argv[1]),
+        'pre-merge-commit': lambda _: (),
         'pre-commit': lambda _: (),
         'pre-push': _pre_push,
     }