mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-08 04:18:52 +00:00
Merge branch '3.3.x'
This commit is contained in:
commit
6593440b56
1 changed files with 6 additions and 0 deletions
|
@ -34,6 +34,12 @@ then
|
||||||
ticket_id=$(sed -E 's/(ticket\/)(security\/)?([0-9]+)(.+$)?/\3/gm;t;d' <<< "$branch");
|
ticket_id=$(sed -E 's/(ticket\/)(security\/)?([0-9]+)(.+$)?/\3/gm;t;d' <<< "$branch");
|
||||||
branch_title=$(sed -E 's/(ticket\/)(security\/)?([0-9]+)(.+$)?/\1\2\3/gm;t;d' <<< "$branch");
|
branch_title=$(sed -E 's/(ticket\/)(security\/)?([0-9]+)(.+$)?/\1\2\3/gm;t;d' <<< "$branch");
|
||||||
|
|
||||||
|
# Fall back to branch name if no ticket ID
|
||||||
|
if [ -z "$branch_title" ];
|
||||||
|
then
|
||||||
|
branch_title="$branch";
|
||||||
|
fi
|
||||||
|
|
||||||
if [ "security/" = "$(sed -E 's/(ticket\/)(security\/)?([0-9]+)(.+$)?/\2/gm;t;d' <<< "$branch")" ];
|
if [ "security/" = "$(sed -E 's/(ticket\/)(security\/)?([0-9]+)(.+$)?/\2/gm;t;d' <<< "$branch")" ];
|
||||||
then
|
then
|
||||||
tail="$(printf '\n\nSECURITY-%s' "$ticket_id")";
|
tail="$(printf '\n\nSECURITY-%s' "$ticket_id")";
|
||||||
|
|
Loading…
Add table
Reference in a new issue