Skip to content

Commit f79466b

Browse files
Nightapesfwiedmann
authored andcommitted
fix(gitutil): don't crash if no last version was found
1 parent 5225b12 commit f79466b

File tree

2 files changed

+16
-7
lines changed

2 files changed

+16
-7
lines changed

internal/gitutil/gitutil.go

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -123,10 +123,19 @@ func (g *GitUtil) GetLastVersion() (*semver.Version, *plumbing.Reference, error)
123123
// GetCommits from git hash to HEAD
124124
func (g *GitUtil) GetCommits(lastTagHash *plumbing.Reference) ([]shared.Commit, error) {
125125

126-
excludeIter, err := g.Repository.Log(&git.LogOptions{From: lastTagHash.Hash()})
126+
ref, err := g.Repository.Head()
127127
if err != nil {
128128
return nil, err
129129
}
130+
logOptions := &git.LogOptions{From: ref.Hash()}
131+
132+
if lastTagHash != nil {
133+
logOptions = &git.LogOptions{From: lastTagHash.Hash()}
134+
}
135+
excludeIter, err := g.Repository.Log(logOptions)
136+
if err != nil {
137+
return nil, fmt.Errorf("could not get git log %w", err)
138+
}
130139

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

145-
ref, err := g.Repository.Head()
146-
if err != nil {
147-
return nil, err
148-
}
149154
startCommit, err := g.Repository.CommitObject(ref.Hash())
150155
if err != nil {
151156
return nil, err

pkg/semanticrelease/semantic-release.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package semanticrelease
22

33
import (
4+
"fmt"
45
"github.com/Nightapes/go-semantic-release/internal/integrations"
56
"io/ioutil"
67
"time"
@@ -102,7 +103,7 @@ func (s *SemanticRelease) GetNextVersion(provider *ci.ProviderConfig, force bool
102103

103104
commits, err := s.gitUtil.GetCommits(lastVersionHash)
104105
if err != nil {
105-
return nil, err
106+
return nil, fmt.Errorf("could not get commits %w", err)
106107
}
107108

108109
log.Debugf("Found %d commits till last release", len(commits))
@@ -131,12 +132,15 @@ func (s *SemanticRelease) GetNextVersion(provider *ci.ProviderConfig, force bool
131132
Version: &newVersion,
132133
},
133134
Last: shared.ReleaseVersionEntry{
134-
Commit: lastVersionHash.Hash().String(),
135+
Commit: "",
135136
Version: lastVersion,
136137
},
137138
Branch: provider.Branch,
138139
Commits: analyzedCommits,
139140
}
141+
if lastVersionHash != nil {
142+
releaseVersion.Last.Commit = lastVersionHash.Hash().String()
143+
}
140144

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

0 commit comments

Comments
 (0)