From 8954a689538da6431b67fd215cc661b363fd5de2 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 5 May 2024 09:37:09 +0200 Subject: [PATCH] [ticket/17308] Change project key to start with PHPBB- PHPBB-17308 --- .github/PULL_REQUEST_TEMPLATE.md | 2 +- git-tools/hooks/commit-msg | 4 ++-- git-tools/hooks/prepare-commit-msg | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 179d83d837..c7bec59af9 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -7,4 +7,4 @@ Checklist: Tracker ticket: -https://tracker.phpbb.com/browse/PHPBB3-12345 +https://tracker.phpbb.com/browse/PHPBB-12345 diff --git a/git-tools/hooks/commit-msg b/git-tools/hooks/commit-msg index 5f5e9c29ce..6405d5b7c8 100755 --- a/git-tools/hooks/commit-msg +++ b/git-tools/hooks/commit-msg @@ -224,7 +224,7 @@ do "footer") err=$ERR_FOOTER; # Each ticket is on its own line - echo "$line" | grep -Eq "^PHPBB3-[0-9]+$"; + echo "$line" | grep -Eq "^PHPBB3?-[0-9]+$"; ;; "eof") err=$ERR_EOF; @@ -356,7 +356,7 @@ echo "$expecting" | grep -q "eof" || ( # Check the branch ticket is mentioned, doesn't make sense otherwise if [ $ticket -gt 0 ] then - echo "$tickets" | grep -Eq "\bPHPBB3-$ticket\b" || ( + echo "$tickets" | grep -Eq "\bPHPBB3?-$ticket\b" || ( complain "Ticket ID [$ticket] of branch missing from list of tickets:" >&2; complain "$tickets" | sed 's/ /\n/g;s/^/* /g' >&2; quit $ERR_FOOTER; diff --git a/git-tools/hooks/prepare-commit-msg b/git-tools/hooks/prepare-commit-msg index 83db1f9ba1..6e5b701fde 100755 --- a/git-tools/hooks/prepare-commit-msg +++ b/git-tools/hooks/prepare-commit-msg @@ -47,7 +47,7 @@ then # Branch is prefixed with 'ticket/', append ticket ID to message if [ "$branch" != "${branch##ticket/}" ]; then - tail="$(printf '\n\nPHPBB3-%s' "$ticket_id")"; + tail="$(printf '\n\nPHPBB-%s' "$ticket_id")"; fi fi