cybercinch/go-semantic-release
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 14 Wiki Activity

fix(internal/gitutil): allow lightweight tags

Browse Source
This commit is contained in:
Nightapes
2019-07-21 21:53:33 +02:00
parent 58f2ebb6d0
commit 7b4db67cb7
1 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
internal/gitutil/gitutil.go
View File

@@ -93,15 +93,10 @@ func (g *GitUtil) GetLastVersion() (*semver.Version, string, error) {
err = gitTags.ForEach(func(p *plumbing.Reference) error { err = gitTags.ForEach(func(p *plumbing.Reference) error {
v, err := semver.NewVersion(p.Name().Short()) v, err := semver.NewVersion(p.Name().Short())
log.Tracef("%+v", p.Name().Short()) log.Tracef("%+v with hash: %s", p.Target(), p.Hash())
if err == nil { if err == nil {
_, err := g.Repository.TagObject(p.Hash()) tags = append(tags, v)
if err == nil {
log.Debugf("Add tag %s", p.Name().Short())
tags = append(tags, v)
} else {
log.Debugf("Found tag, but is not annotated, skip")
}
} else { } else {
log.Debugf("Tag %s is not a valid version, skip", p.Name().Short()) log.Debugf("Tag %s is not a valid version, skip", p.Name().Short())
} }
@@ -126,13 +121,8 @@ func (g *GitUtil) GetLastVersion() (*semver.Version, string, error) {
return nil, "", err return nil, "", err
} }
tagObject, err := g.Repository.TagObject(tag.Hash()) log.Debugf("Found old hash %s", tag.Hash().String())
if err != nil { return tags[0], tag.Hash().String(), nil
return nil, "", err
}
log.Debugf("Found old hash %s", tagObject.Target.String())
return tags[0], tagObject.Target.String(), nil
} }
// GetCommits from git hash to HEAD // GetCommits from git hash to HEAD
@@ -155,9 +145,10 @@ func (g *GitUtil) GetCommits(lastTagHash string) ([]Commit, error) {
if c.Hash.String() == lastTagHash { if c.Hash.String() == lastTagHash {
log.Debugf("Found commit with hash %s, will stop here", c.Hash.String()) log.Debugf("Found commit with hash %s, will stop here", c.Hash.String())
foundEnd = true foundEnd = true
} }
log.Tracef("Found commit with hash %s", c.Hash.String())
if !foundEnd { if !foundEnd {
log.Tracef("Found commit with hash %s", c.Hash.String())
commit := Commit{ commit := Commit{
Message: c.Message, Message: c.Message,
Author: c.Committer.Name, Author: c.Committer.Name,