Skip to content

Commit 5003c48

Browse files
committed
wip: removed fatal log
1 parent 8545feb commit 5003c48

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

pkg/git/RepositoryManagerAnalytics.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
"github.com/go-git/go-git/v5/plumbing/object"
1010
"go.uber.org/zap"
1111
"io"
12-
"log"
1312
"strings"
1413
"time"
1514
)
@@ -78,7 +77,7 @@ func computeDiff(r *git.Repository, newHash *plumbing.Hash, oldHash *plumbing.Ha
7877
m, err := ancestorStack[lastIndex].MergeBase(c2)
7978
//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))
8079
if err != nil {
81-
log.Fatal("Error in mergebase " + ancestorStack[lastIndex].Hash.String() + " " + c2.Hash.String())
80+
return nil, fmt.Errorf("error in mergebase %s %s - err %w", ancestorStack[lastIndex].Hash.String(), c2.Hash.String(), err)
8281
}
8382
// if commit being analyzed is itself merge commit then dont process as it is common in both old and new
8483
if in(ancestorStack[lastIndex], m) {

0 commit comments

Comments
 (0)