Merge a0a26fe into a7fc69a

CHANGES.rst

@@ -5,9 +5,14 @@ Changelog
 ------------------
 
 - Refactor and fix docs
+  [MrTango]
+
 - Fix updating of parent FTI file, when parent type name contains spaces, fixes #331
   [MrTango]
 
+- Don't do git auto commit if git init was disabled in addon template, fixes #300
+  [MrTango]
+
 
 3.5.0 (2018-10-17)
 ------------------

bobtemplates/plone/addon.py

@@ -137,10 +137,11 @@ def pre_ask(configurator):
 
 def post_render(configurator):
     _cleanup_package(configurator)
-    git_init(configurator)
-    git_commit(
-        configurator,
-        'Create addon: {0}'.format(
-            configurator.variables['package.dottedname'],
-        ),
-    )
+    git_init_status = git_init(configurator)
+    if git_init_status:
+        git_commit(
+            configurator,
+            'Create addon: {0}'.format(
+                configurator.variables['package.dottedname'],
+            ),
+        )

bobtemplates/plone/base.py

@@ -44,8 +44,8 @@ def to_boolean(value):
 def git_support_enabled(configurator, question):
     disabled = configurator.variables.get('package.git.disabled', u'False')
     if hooks.to_boolean(None, None, disabled):
-        echo(u'GIT support disabled!')
-        raise SkipQuestion(u'GIT support is disabled, skip question!.')
+        echo(u'GIT support disabled!!!')
+        raise SkipQuestion(u'GIT support is disabled, skip question!')
 
 
 def echo(msg, msg_type=None):
@@ -103,6 +103,7 @@ def git_init(configurator):
     else:
         if result:
             echo(result, 'info')
+    return True
 
 
 def git_commit(configurator, msg):

package-tests/test_addon.py

@@ -58,4 +58,3 @@ def test_cleanup_package(tmpdir):
     )
     assert configurator
     configurator.render()
-    # addon._cleanup_package(configurator)