Skip to content

Commit

Permalink
feat: update
Browse files Browse the repository at this point in the history
  • Loading branch information
ryan-timothy-albert committed Feb 7, 2025
1 parent 9e7bf11 commit b42cf24
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions internal/git/git.go
Original file line number Diff line number Diff line change
Expand Up @@ -946,7 +946,6 @@ func (g *Git) GetChangedFilesForPRorBranch() ([]string, error) {
// This occurs if we come from a non-PR event trigger
if payload.Number == 0 {
ref := strings.TrimPrefix(environment.GetRef(), "refs/heads/")

if ref == "main" || ref == "master" {
// We just need to get the commit diff since we are not in a separate branch of PR
return g.GetCommitedFiles()
Expand All @@ -958,15 +957,10 @@ func (g *Git) GetChangedFilesForPRorBranch() ([]string, error) {
defaultBranch = payload.Repository.DefaultBranch
}

// Clone the main branch
mainRepo, err := g.CloneRepo(defaultBranch)
if err != nil {
return nil, fmt.Errorf("failed to clone main repository: %w", err)
}

// Get the feature branch reference
branchRef, err := g.repo.Reference(plumbing.NewBranchReferenceName(ref), true)
branchRef, err := g.repo.Reference(plumbing.ReferenceName(environment.GetRef()), true)
if err != nil {
fmt.Println("REFERENCE", environment.GetRef())
return nil, fmt.Errorf("failed to get feature branch reference: %w", err)
}

Expand All @@ -976,11 +970,17 @@ func (g *Git) GetChangedFilesForPRorBranch() ([]string, error) {
return nil, fmt.Errorf("failed to get latest commit of feature branch: %w", err)
}

// Get the latest commit on the main branch
mainRef, err := mainRepo.Reference(plumbing.NewBranchReferenceName(defaultBranch), true)
// Clone the main branch
mainRepo, err := g.CloneRepo(defaultBranch)
if err != nil {
return nil, fmt.Errorf("failed to clone main repository: %w", err)
}

mainRef, err := mainRepo.Reference(plumbing.ReferenceName("refs/heads/"+defaultBranch), true)
if err != nil {
return nil, fmt.Errorf("failed to get main branch reference: %w", err)
}

mainCommit, err := mainRepo.CommitObject(mainRef.Hash())
if err != nil {
return nil, fmt.Errorf("failed to get main branch commit: %w", err)
Expand Down

0 comments on commit b42cf24

Please sign in to comment.