Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add options to pass a repo path, and to handle lightweight tags #11

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: add options to pass a repo path, and to handle lightweight tags #11

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions cmd/generate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,18 +33,22 @@ The generated changelog is written to standard out.
var commitURL string
var versionStr string
var outputFile string
var repoPath string
var lightweightOK bool

func init() {
rootCmd.AddCommand(generateCmd)

generateCmd.PersistentFlags().StringVar(&commitURL, "commit-url", "", "URL for linking to specific commits. The commit SHA will be appended as the last path element of the URL.")
generateCmd.PersistentFlags().StringVar(&versionStr, "version", "", "The version of the release, a change log is generated for all commits between this version and the next lowest version. If the version is empty a changelog is generated for HEAD.")
generateCmd.PersistentFlags().StringVarP(&outputFile, "output", "o", "", "Write changelog output to the file (use - for stdout)")
generateCmd.PersistentFlags().StringVarP(&repoPath, "path", "p", ".", "The absolute path at which to look for a git repo")
generateCmd.PersistentFlags().BoolVarP(&lightweightOK, "light", "l", false, "Whether to consider lightweight commits when looking for tags")
}

// doGenerate generates the changelog writing it to stdout.
func doGenerate(cmd *cobra.Command, args []string) error {
r, err := git.PlainOpenWithOptions(".", &git.PlainOpenOptions{
r, err := git.PlainOpenWithOptions(repoPath, &git.PlainOpenOptions{
DetectDotGit: true,
})
if err != nil {
Expand Down Expand Up @@ -109,6 +113,7 @@ func createRelease(r *git.Repository, verTag string) (*Release, error) {
func findVersionHash(r *git.Repository, verTag string) (plumbing.Hash, error) {
if verTag == "" {
ref, err := r.Head()
//log.Printf(ref.String())
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

commented code

if err != nil {
return plumbing.ZeroHash, err
}
Expand Down Expand Up @@ -201,9 +206,13 @@ func findPreviousRelease(r *git.Repository, v *semver.Version) (*semver.Version,
if maxRef == nil {
return nil, plumbing.ZeroHash, errors.New("no previous release found")
}
tag, err := r.TagObject(maxRef.Hash())
tag, err := r.TagObject(maxRef.Hash()) // only returns Annotated Tags
if err != nil {
return nil, plumbing.ZeroHash, errors.Wrap(err, "could not get tag object from maxRef")
if !lightweightOK {
return nil, plumbing.ZeroHash, errors.Wrap(err, "could not get tag object from maxRef")
} else {
return maxVersion, maxRef.Hash(), nil
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does Tag work here? https://github.com/src-d/go-git/blob/8b0c2116cea2bbcc8d0075e762b887200a1898e1/repository_test.go#L2173

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you elaborate a bit more? I'm not quite sure what you're asking.

}
}
return maxVersion, tag.Target, nil
}
Expand Down