Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
2ab679ac
Commit
2ab679ac
authored
Apr 27, 2021
by
Andy Wilkinson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update prepare-forward-merge following master->main rename
See gh-26248
parent
715c4feb
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
prepare-forward-merge
git/hooks/prepare-forward-merge
+3
-3
No files found.
git/hooks/prepare-forward-merge
View file @
2ab679ac
...
...
@@ -4,7 +4,7 @@ require 'net/http'
require
'yaml'
require
'logger'
$ma
ster
_branch
=
"2.5.x"
$ma
in
_branch
=
"2.5.x"
$log
=
Logger
.
new
(
STDOUT
)
$log
.
level
=
Logger
::
WARN
...
...
@@ -26,8 +26,8 @@ end
def
rewrite_message
(
message_file
,
fixed
)
current_branch
=
`git rev-parse --abbrev-ref HEAD`
.
strip
if
current_branch
==
"ma
ster
"
current_branch
=
$ma
ster
_branch
if
current_branch
==
"ma
in
"
current_branch
=
$ma
in
_branch
end
rewritten_message
=
""
message
=
File
.
read
(
message_file
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment