diff --git a/.githooks/ensure_release_tag b/.githooks/ensure_release_tag deleted file mode 100755 index 7d195756..00000000 --- a/.githooks/ensure_release_tag +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash - -# Pushing a release branch requires an annotated tag at the released commit -branch=$(git rev-parse --abbrev-ref HEAD) - -if [[ $branch =~ master ]]; then - # check if HEAD commit is tagged - if ! git describe --exact-match HEAD; then - echo "Commits to master must be tagged" - exit 1 - fi -elif [[ $branch =~ release/* ]]; then - IFS=/ read -r branch rel_ver <<< ${branch} - tag=$(git describe --tags --abbrev=0) - if [[ "${rel_ver}" != "${tag}" ]]; then - echo "release/${rel_ver} branches must have annotated tag ${rel_ver}" - echo "git tag -am\"${rel_ver}\" ${rel_ver}" - exit 1 - fi -fi diff --git a/.githooks/pre-commit b/.githooks/pre-commit index f70b2dfc..60e037fc 100755 --- a/.githooks/pre-commit +++ b/.githooks/pre-commit @@ -59,4 +59,3 @@ EOF exit 1 fi -.githooks/ensure_release_tag