Skip to content

Commit

Permalink
Merge branch 'dev' into improve-logs
Browse files Browse the repository at this point in the history
  • Loading branch information
sverdlov93 authored Oct 4, 2023
2 parents 249833c + 63c4cce commit 86e7bb2
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions utils/git.go
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,8 @@ func (m *GitManager) readUrl() {
IsNextLineUrl = true
}
}
if err != nil {
m.err = err
if err := scanner.Err(); err != nil {
m.err = errorutils.CheckError(err)
return
}
if !strings.HasSuffix(originUrl, ".git") {
Expand Down Expand Up @@ -233,8 +233,8 @@ func (m *GitManager) readRevisionFromRef(refPath string) {
revision = strings.TrimSpace(text)
break
}
if err != nil {
m.err = err
if err := scanner.Err(); err != nil {
m.err = errorutils.CheckError(err)
return
}
m.revision = revision
Expand Down Expand Up @@ -271,8 +271,8 @@ func (m *GitManager) readRevisionFromPackedRef(ref string) {
return
}
}
if err != nil {
m.err = err
if err = scanner.Err(); err != nil {
m.err = errorutils.CheckError(err)
return
}
}
Expand Down

0 comments on commit 86e7bb2

Please sign in to comment.