Merge pull request #3608 from ActiveState/mitchell/dx-3175

mitchell-as · web-flow · commit e554f37d322a · 2024-12-02T09:52:38.000-05:00
`state pull` should use the already-merged commit's build script instead of attempting a merge.
diff --git a/internal/runners/pull/pull.go b/internal/runners/pull/pull.go
@@ -278,12 +278,10 @@ func (p *Pull) mergeBuildScript(remoteCommit, localCommit strfmt.UUID) error {
 	// Compute the merge strategy.
 	strategies, err := model.MergeCommit(remoteCommit, localCommit)
 	if err != nil {
-		switch {
-		case errors.Is(err, model.ErrMergeFastForward):
+		if errors.Is(err, model.ErrMergeFastForward) || errors.Is(err, model.ErrMergeCommitInHistory) {
 			return buildscript_runbit.Update(p.project, scriptB)
-		case !errors.Is(err, model.ErrMergeCommitInHistory):
-			return locale.WrapError(err, "err_mergecommit", "Could not detect if merge is necessary.")
 		}
+		return locale.WrapError(err, "err_mergecommit", "Could not detect if merge is necessary.")
 	}
 
 	// Attempt the merge.

Original file line number	Diff line number	Diff line change
`@@ -278,12 +278,10 @@ func (p *Pull) mergeBuildScript(remoteCommit, localCommit strfmt.UUID) error {`
`278`	`278`	`// Compute the merge strategy.`
`279`	`279`	`strategies, err := model.MergeCommit(remoteCommit, localCommit)`
`280`	`280`	`if err != nil {`
`281`		`- switch {`
`282`		`- case errors.Is(err, model.ErrMergeFastForward):`
	`281`	`+ if errors.Is(err, model.ErrMergeFastForward) \|\| errors.Is(err, model.ErrMergeCommitInHistory) {`
`283`	`282`	`return buildscript_runbit.Update(p.project, scriptB)`
`284`		`- case !errors.Is(err, model.ErrMergeCommitInHistory):`
`285`		`- return locale.WrapError(err, "err_mergecommit", "Could not detect if merge is necessary.")`
`286`	`283`	`}`
	`284`	`+ return locale.WrapError(err, "err_mergecommit", "Could not detect if merge is necessary.")`
`287`	`285`	`}`
`288`	`286`
`289`	`287`	`// Attempt the merge.`