Skip to content

Commit

Permalink
Merge pull request #99 from devtron-labs/removing-fatal-log
Browse files Browse the repository at this point in the history
fix: removed fatal log
  • Loading branch information
iamayushm authored Apr 18, 2024
2 parents 8545feb + 5003c48 commit 51001cb
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions pkg/git/RepositoryManagerAnalytics.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import (
"github.com/go-git/go-git/v5/plumbing/object"
"go.uber.org/zap"
"io"
"log"
"strings"
"time"
)
Expand Down Expand Up @@ -78,7 +77,7 @@ func computeDiff(r *git.Repository, newHash *plumbing.Hash, oldHash *plumbing.Ha
m, err := ancestorStack[lastIndex].MergeBase(c2)
//fmt.Printf("mergebase between %s and %s is %s length %d\n", ancestorStack[lastIndex].Hash.String(), c2.Hash.String(), m[0].Hash.String(), len(m))
if err != nil {
log.Fatal("Error in mergebase " + ancestorStack[lastIndex].Hash.String() + " " + c2.Hash.String())
return nil, fmt.Errorf("error in mergebase %s %s - err %w", ancestorStack[lastIndex].Hash.String(), c2.Hash.String(), err)
}
// if commit being analyzed is itself merge commit then dont process as it is common in both old and new
if in(ancestorStack[lastIndex], m) {
Expand Down

0 comments on commit 51001cb

Please sign in to comment.