actions/git-backporting
1
0
Fork 0
mirror of https://code.forgejo.org/actions/git-backporting.git synced 2025-05-13 09:09:13 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat(issue-62): make cherry-pick strategy configurable (#63)

Browse source 
fix https://github.com/kiegroup/git-backporting/issues/62
This commit is contained in:
Andrea Lamparelli 2023-07-12 13:50:59 +02:00 • committed by GitHub
parent ead1322c0f
commit 265955dda7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
18 changed files with 312 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/service/configs/pullrequest/pr-configs-parser.ts
View file

@ -30,6 +30,8 @@ export default class PullRequestConfigsParser extends ConfigsParser {
auth: args.auth,
folder: `${folder.startsWith("/") ? "" : process.cwd() + "/"}${args.folder ?? this.getDefaultFolder()}`,
targetBranch: args.targetBranch,
mergeStrategy: args.strategy,
mergeStrategyOption: args.strategyOption,
originalPullRequest: pr,
backportPullRequest: this.getDefaultBackportPullRequest(pr, args),
git: {