Skip to content

Commit

Permalink
let's just ... get rid of the check, see what happens
Browse files Browse the repository at this point in the history
  • Loading branch information
djeebus committed Dec 14, 2023
1 parent 6dfb554 commit 2d42536
Showing 1 changed file with 0 additions and 8 deletions.
8 changes: 0 additions & 8 deletions pkg/repo/repo.go
Original file line number Diff line number Diff line change
Expand Up @@ -109,14 +109,6 @@ func (r *Repo) MergeIntoTarget(ctx context.Context) error {
))
defer span.End()

if r.DefaultBranch != "" {
if r.BaseRef != r.DefaultBranch {
err := fmt.Errorf("target branch (%s) is not default branch (%s)\nfor kubechecks to run target branch must be default branch", r.HeadRef, r.DefaultBranch)
telemetry.SetError(span, err, "MergeIntoTarget")
return err
}
}

log.Debug().Msgf("Merging MR commit %s into a tmp branch off of %s for manifest generation...", r.SHA, r.BaseRef)
cmd := exec.Command("git", "fetch", r.Remote, r.BaseRef)
cmd.Dir = r.RepoDir
Expand Down

0 comments on commit 2d42536

Please sign in to comment.