Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
f3ddb9f4
Commit
f3ddb9f4
authored
May 14, 2018
by
James Lopez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update secpick to use security branches
parent
44e64a04
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
2 deletions
+1
-2
bin/secpick
bin/secpick
+1
-2
No files found.
bin/secpick
View file @
f3ddb9f4
...
@@ -5,7 +5,6 @@ require 'rainbow/refinement'
...
@@ -5,7 +5,6 @@ require 'rainbow/refinement'
using
Rainbow
using
Rainbow
BRANCH_PREFIX
=
'security'
.
freeze
BRANCH_PREFIX
=
'security'
.
freeze
STABLE_BRANCH_SUFFIX
=
'stable'
.
freeze
REMOTE
=
'dev'
.
freeze
REMOTE
=
'dev'
.
freeze
options
=
{
version:
nil
,
branch:
nil
,
sha:
nil
}
options
=
{
version:
nil
,
branch:
nil
,
sha:
nil
}
...
@@ -37,7 +36,7 @@ abort("Missing options. Use #{$0} --help to see the list of options available".r
...
@@ -37,7 +36,7 @@ abort("Missing options. Use #{$0} --help to see the list of options available".r
abort
(
"Wrong version format
#{
options
[
:version
].
bold
}
"
.
red
)
unless
options
[
:version
]
=~
/\A\d*\-\d*\Z/
abort
(
"Wrong version format
#{
options
[
:version
].
bold
}
"
.
red
)
unless
options
[
:version
]
=~
/\A\d*\-\d*\Z/
branch
=
[
BRANCH_PREFIX
,
options
[
:branch
],
options
[
:version
]].
join
(
'-'
).
freeze
branch
=
[
BRANCH_PREFIX
,
options
[
:branch
],
options
[
:version
]].
join
(
'-'
).
freeze
stable_branch
=
"
#{
options
[
:version
]
}
-
#{
STABLE_BRANCH_SUFFIX
}
"
.
freeze
stable_branch
=
"
#{
BRANCH_PREFIX
}
-
#{
options
[
:version
]
}
"
.
freeze
command
=
"git checkout
#{
stable_branch
}
&& git pull
#{
REMOTE
}
#{
stable_branch
}
&& git checkout -B
#{
branch
}
&& git cherry-pick
#{
options
[
:sha
]
}
&& git push
#{
REMOTE
}
#{
branch
}
"
command
=
"git checkout
#{
stable_branch
}
&& git pull
#{
REMOTE
}
#{
stable_branch
}
&& git checkout -B
#{
branch
}
&& git cherry-pick
#{
options
[
:sha
]
}
&& git push
#{
REMOTE
}
#{
branch
}
"
...
...
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