Commit ab669a69 authored by Dom Sekotill's avatar Dom Sekotill
Browse files

Add a pre-commit hook blocking merges from release 

Merges from a release branch to any other branch are forbidden, this
hook has been added as a reminder to maintainers not to attempt it.
parent 5dfa5d51

.pre-commit-config.yaml

+10 −0
Original line number Diff line number Diff line
@@ -16,6 +16,16 @@ repos: 
  - id: end-of-file-fixer

  - id: trailing-whitespace



- repo: local

  hooks:

  - id: block-merge-from-release

    name: Disable merges from the release branch

    language: system

    entry: .pre-commit.d/block-merge-from-release.sh

    always_run: true

    pass_filenames: false

    stages: [commit, merge-commit]



- repo: https://github.com/jorisroovers/gitlint

  rev: v0.13.1

  hooks:

.pre-commit.d/block-merge-from-release.sh

0 → 100755
+5 −0
Original line number Diff line number Diff line 
#!/bin/sh

set -eu



merge_head=`git rev-parse --revs-only --symbolic-full-name MERGE_HEAD`

case $merge_head in refs/heads/release*) exit 1 ;; esac