From b6e8859a04b08e3ab91e2f86315b03ed76f2c47d Mon Sep 17 00:00:00 2001
From: Oliver Hader <oliver@typo3.org>
Date: Mon, 29 Nov 2021 13:04:39 +0100
Subject: [PATCH] [TASK] Update Git commit hook
Resolves: #96133
Releases: main, 11.5, 10.4
Change-Id: Ic1924bbf34b746bf1891419da6cb54e547a509a8
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/72351
Tested-by: Benni Mack <benni@typo3.org>
Tested-by: core-ci <typo3@b13.com>
Tested-by: Oliver Bartsch <bo@cedev.de>
Reviewed-by: Benni Mack <benni@typo3.org>
Reviewed-by: Oliver Klee <typo3-coding@oliverklee.de>
Reviewed-by: Oliver Bartsch <bo@cedev.de>
---
Build/git-hooks/commit-msg | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Build/git-hooks/commit-msg b/Build/git-hooks/commit-msg
index c98a562d0700..ddcde1117f7b 100755
--- a/Build/git-hooks/commit-msg
+++ b/Build/git-hooks/commit-msg
@@ -222,9 +222,9 @@ checkForResolves() {
# Check for existence of a "Releases: " line.
#
checkForReleases() {
- if ! egrep -q '^Releases: (master|[0-9]+\.[0-9])(, *(master|[0-9]+\.[0-9]))*$' "$MSG"; then
+ if ! egrep -q '^Releases: (main|[0-9]+\.[0-9])(, *(main|[0-9]+\.[0-9]))*$' "$MSG"; then
COMMIT_MSG_ERROR_FOUND=1
- ERROR_TEXT="${ERROR_TEXT} - You need a 'Releases:' line. For instance: Releases: master, 8.7\n"
+ ERROR_TEXT="${ERROR_TEXT} - You need a 'Releases:' line. For instance: Releases: main, 8.7\n"
fi
}
--
GitLab