Hook-it should configure gitflow.allow-master-commit and gitflow.allo…

…w-conflict-master

hook-it

@@ -51,6 +51,14 @@ function inject_hooks() {
   $NOOP $GIT -C $repo config gitflow.hotfix.finish.message  "Hotfix %tag%"
   $NOOP $GIT -C $repo config gitflow.release.finish.message "Release %tag%"
 
+  if [[ -z $($GIT -C $repo config --get gitflow.branch.allow-master-commit) ]]; then
+    $NOOP $GIT -C $repo config gitflow.branch.allow-master-commit false
+  fi
+
+  if [[ -z $($GIT -C $repo config --get gitflow.branch.allow-conflict-commit) ]]; then
+    $NOOP $GIT -C $repo config gitflow.branch.allow-conflict-commit false
+  fi
+
   # 3/ find language
   if [[ -e $repo/package.json ]]; then
     language="node"
@@ -170,4 +178,4 @@ function main() {
   inject_hooks "$1" || die "$ERROR"
 }
 
-main "$@"
+main "$@"

hook-it.ps1

@@ -59,6 +59,20 @@ if ($PSCmdlet.ShouldProcess("gitflow", "Configure Messages")) {
     Write-Error "git flow Release Finish Message configuration failed"
     exit 1
   }
+  if ( (git -C $Path config --get gitflow.branch.allow-master-commit) == "" ) {
+    git -C $Path config --bool gitflow.branch.allow-master-commit false
+    if ( $LASTEXITCODE -ne 0 ) {
+      Write-Error "git flow Allow Master Commit configuration failed"
+      exit 1
+    }
+  }
+  if ( (git -C $Path config --get gitflow.branch.allow-config-commit) == "" ) {
+    git -C $Path config --bool gitflow.branch.allow-config-commit false
+    if ( $LASTEXITCODE -ne 0 ) {
+      Write-Error "git flow Allow Conflict Commit configuration failed"
+      exit 1
+    }
+  }
 }
 
 # 3/ copy hooks