DeleteSourceBranchOnMerge issue fixed (#1560)

runatlantis · May 10, 2021 · 429235d · 429235d
1 parent fc162f5
commit 429235d
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/server/events/project_command_builder.go b/server/events/project_command_builder.go
@@ -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
 	}
@@ -483,7 +481,7 @@ func (p *DefaultProjectCommandBuilder) buildProjectCommandCtx(ctx *CommandContex
 					commentFlags,
 					repoDir,
 					automerge,
-					deleteBranchOnMerge,
+					projCfg.DeleteSourceBranchOnMerge,
 					parallelPlan,
 					parallelApply,
 					verbose,
@@ -499,7 +497,7 @@ func (p *DefaultProjectCommandBuilder) buildProjectCommandCtx(ctx *CommandContex
 				commentFlags,
 				repoDir,
 				automerge,
-				deleteBranchOnMerge,
+				projCfg.DeleteSourceBranchOnMerge,
 				parallelPlan,
 				parallelApply,
 				verbose,