Skip to content

Commit

Permalink
fix(gitutil): don't crash if no last version was found
Browse files Browse the repository at this point in the history
  • Loading branch information
Nightapes authored and fwiedmann committed May 6, 2021
1 parent 5225b12 commit f79466b
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 7 deletions.
15 changes: 10 additions & 5 deletions internal/gitutil/gitutil.go
Original file line number Diff line number Diff line change
Expand Up @@ -123,10 +123,19 @@ func (g *GitUtil) GetLastVersion() (*semver.Version, *plumbing.Reference, error)
// GetCommits from git hash to HEAD
func (g *GitUtil) GetCommits(lastTagHash *plumbing.Reference) ([]shared.Commit, error) {

excludeIter, err := g.Repository.Log(&git.LogOptions{From: lastTagHash.Hash()})
ref, err := g.Repository.Head()
if err != nil {
return nil, err
}
logOptions := &git.LogOptions{From: ref.Hash()}

if lastTagHash != nil {
logOptions = &git.LogOptions{From: lastTagHash.Hash()}
}
excludeIter, err := g.Repository.Log(logOptions)
if err != nil {
return nil, fmt.Errorf("could not get git log %w", err)
}

seen := map[plumbing.Hash]struct{}{}
err = excludeIter.ForEach(func(c *object.Commit) error {
Expand All @@ -142,10 +151,6 @@ func (g *GitUtil) GetCommits(lastTagHash *plumbing.Reference) ([]shared.Commit,
return !ok && len(commit.ParentHashes) < 2
}

ref, err := g.Repository.Head()
if err != nil {
return nil, err
}
startCommit, err := g.Repository.CommitObject(ref.Hash())
if err != nil {
return nil, err
Expand Down
8 changes: 6 additions & 2 deletions pkg/semanticrelease/semantic-release.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package semanticrelease

import (
"fmt"
"github.com/Nightapes/go-semantic-release/internal/integrations"
"io/ioutil"
"time"
Expand Down Expand Up @@ -102,7 +103,7 @@ func (s *SemanticRelease) GetNextVersion(provider *ci.ProviderConfig, force bool

commits, err := s.gitUtil.GetCommits(lastVersionHash)
if err != nil {
return nil, err
return nil, fmt.Errorf("could not get commits %w", err)
}

log.Debugf("Found %d commits till last release", len(commits))
Expand Down Expand Up @@ -131,12 +132,15 @@ func (s *SemanticRelease) GetNextVersion(provider *ci.ProviderConfig, force bool
Version: &newVersion,
},
Last: shared.ReleaseVersionEntry{
Commit: lastVersionHash.Hash().String(),
Commit: "",
Version: lastVersion,
},
Branch: provider.Branch,
Commits: analyzedCommits,
}
if lastVersionHash != nil {
releaseVersion.Last.Commit = lastVersionHash.Hash().String()
}

if firstRelease {
releaseVersion.Last.Version, _ = semver.NewVersion("0.0.0")
Expand Down

0 comments on commit f79466b

Please sign in to comment.