From 4b928ab06b87c81be25f8cd78bf702bf70b4e28f Mon Sep 17 00:00:00 2001
From: Chris Kuehl <ckuehl@yelp.com>
Date: Wed, 30 Nov 2016 10:10:29 -0800
Subject: [PATCH] Add forbid-new-submodules to hooks.yaml

---
 README.md                                 | 1 +
 hooks.yaml                                | 6 ++++++
 pre_commit_hooks/forbid_new_submodules.py | 2 ++
 setup.py                                  | 1 +
 4 files changed, 10 insertions(+)

diff --git a/README.md b/README.md
index ee77b25..860d50b 100644
--- a/README.md
+++ b/README.md
@@ -48,6 +48,7 @@ Add this to your `.pre-commit-config.yaml`
 - `fix-encoding-pragma` - Add `# -*- coding: utf-8 -*-` to the top of python files.
     - To remove the coding pragma pass `--remove` (useful in a python3-only codebase)
 - `flake8` - Run flake8 on your python files.
+- `forbid-new-submodules` - Prevent addition of new git submodules.
 - `name-tests-test` - Assert that files in tests/ end in `_test.py`.
     - Use `args: ['--django']` to match `test*.py` instead.
 - `pyflakes` - Run pyflakes on your python files.
diff --git a/hooks.yaml b/hooks.yaml
index 11a414c..0604585 100644
--- a/hooks.yaml
+++ b/hooks.yaml
@@ -117,6 +117,12 @@
     entry: flake8
     language: python
     files: \.py$
+-   id: forbid-new-submodules
+    name: Forbid new submodules
+    language: python
+    entry: forbid-new-submodules
+    description: Prevent addition of new git submodules
+    files: ''
 -   id: name-tests-test
     name: Tests should end in _test.py
     description: This verifies that test files are named correctly
diff --git a/pre_commit_hooks/forbid_new_submodules.py b/pre_commit_hooks/forbid_new_submodules.py
index 19f85d0..c9464cf 100644
--- a/pre_commit_hooks/forbid_new_submodules.py
+++ b/pre_commit_hooks/forbid_new_submodules.py
@@ -1,4 +1,5 @@
 from __future__ import absolute_import
+from __future__ import print_function
 from __future__ import unicode_literals
 
 from pre_commit_hooks.util import cmd_output
@@ -19,6 +20,7 @@ def main(argv=None):
             retv = 1
 
     if retv:
+        print()
         print('This commit introduces new submodules.')
         print('Did you unintentionally `git add .`?')
         print('To fix: git rm {thesubmodule}  # no trailing slash')
diff --git a/setup.py b/setup.py
index f92f821..774bc2e 100644
--- a/setup.py
+++ b/setup.py
@@ -52,6 +52,7 @@ setup(
             'double-quote-string-fixer = pre_commit_hooks.string_fixer:main',
             'end-of-file-fixer = pre_commit_hooks.end_of_file_fixer:end_of_file_fixer',
             'fix-encoding-pragma = pre_commit_hooks.fix_encoding_pragma:main',
+            'forbid-new-submodules = pre_commit_hooks.forbid_new_submodules:main',
             'name-tests-test = pre_commit_hooks.tests_should_end_in_test:validate_files',
             'pretty-format-json = pre_commit_hooks.pretty_format_json:pretty_format_json',
             'requirements-txt-fixer = pre_commit_hooks.requirements_txt_fixer:fix_requirements_txt',