Skip to content

Commit f7c491c

Browse files
author
Rhys Koedijk
authored
Fix merge strategy parsing and default value (#1376)
1 parent b27101f commit f7c491c

File tree

1 file changed

+14
-4
lines changed

1 file changed

+14
-4
lines changed

extension/tasks/dependabotV2/utils/dependabot-cli/DependabotOutputProcessor.ts

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -119,10 +119,20 @@ export class DependabotOutputProcessor implements IDependabotUpdateOutputProcess
119119
autoComplete: this.taskInputs.setAutoComplete
120120
? {
121121
ignorePolicyConfigIds: this.taskInputs.autoCompleteIgnoreConfigIds,
122-
mergeStrategy:
123-
GitPullRequestMergeStrategy[
124-
this.taskInputs.mergeStrategy as keyof typeof GitPullRequestMergeStrategy
125-
],
122+
mergeStrategy: (() => {
123+
switch (this.taskInputs.mergeStrategy) {
124+
case 'noFastForward':
125+
return GitPullRequestMergeStrategy.NoFastForward;
126+
case 'squash':
127+
return GitPullRequestMergeStrategy.Squash;
128+
case 'rebase':
129+
return GitPullRequestMergeStrategy.Rebase;
130+
case 'rebaseMerge':
131+
return GitPullRequestMergeStrategy.RebaseMerge;
132+
default:
133+
return GitPullRequestMergeStrategy.Squash;
134+
}
135+
})(),
126136
}
127137
: undefined,
128138
assignees: update.config.assignees,

0 commit comments

Comments
 (0)