Skip to content

Commit

Permalink
DeleteSourceBranchOnMerge issue fixed (#1560)
Browse files Browse the repository at this point in the history
  • Loading branch information
tapaszto authored May 10, 2021
1 parent fc162f5 commit 429235d
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions server/events/project_command_builder.go
Original file line number Diff line number Diff line change
Expand Up @@ -455,12 +455,10 @@ func (p *DefaultProjectCommandBuilder) buildProjectCommandCtx(ctx *CommandContex
var projCtxs []models.ProjectCommandContext
var projCfg valid.MergedProjectCfg
automerge := DefaultAutomergeEnabled
deleteBranchOnMerge := DefaultDeleteSourceBranchOnMerge
parallelApply := DefaultParallelApplyEnabled
parallelPlan := DefaultParallelPlanEnabled
if repoCfgPtr != nil {
automerge = repoCfgPtr.Automerge
deleteBranchOnMerge = projCfg.DeleteSourceBranchOnMerge
parallelApply = repoCfgPtr.ParallelApply
parallelPlan = repoCfgPtr.ParallelPlan
}
Expand All @@ -483,7 +481,7 @@ func (p *DefaultProjectCommandBuilder) buildProjectCommandCtx(ctx *CommandContex
commentFlags,
repoDir,
automerge,
deleteBranchOnMerge,
projCfg.DeleteSourceBranchOnMerge,
parallelPlan,
parallelApply,
verbose,
Expand All @@ -499,7 +497,7 @@ func (p *DefaultProjectCommandBuilder) buildProjectCommandCtx(ctx *CommandContex
commentFlags,
repoDir,
automerge,
deleteBranchOnMerge,
projCfg.DeleteSourceBranchOnMerge,
parallelPlan,
parallelApply,
verbose,
Expand Down

0 comments on commit 429235d

Please sign in to comment.