Merge pull request #1277 from saschagrunert/start-rev-fix

Fix setting start-rev in krel changelog
kubernetes · May 11, 2020 · 61c2711 · 61c2711
2 parents 8ff810d + 8d635b9
commit 61c2711
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/cmd/krel/cmd/changelog.go b/cmd/krel/cmd/changelog.go
@@ -313,6 +313,7 @@ func generateReleaseNotes(opts *changelogOptions, branch, startRev, endRev strin
 
 	notesOptions := options.New()
 	notesOptions.Branch = branch
+	notesOptions.StartRev = startRev
 	notesOptions.EndSHA = endRev
 	notesOptions.RepoPath = rootOpts.repoPath
 	notesOptions.ReleaseBucket = opts.bucket
@@ -323,7 +324,7 @@ func generateReleaseNotes(opts *changelogOptions, branch, startRev, endRev strin
 	notesOptions.Pull = false
 
 	if err := notesOptions.ValidateAndFinish(); err != nil {
-		return "", err
+		return "", errors.Wrap(err, "validating notes options")
 	}
 
 	doc, err := document.GatherReleaseNotesDocument(

diff --git a/pkg/notes/options/options.go b/pkg/notes/options/options.go
@@ -195,15 +195,15 @@ func (o *Options) ValidateAndFinish() (err error) {
 		if o.StartRev != "" && o.StartSHA == "" {
 			sha, err := repo.RevParse(o.StartRev)
 			if err != nil {
-				return err
+				return errors.Wrapf(err, "resolving %s", o.StartRev)
 			}
 			logrus.Infof("using found start SHA: %s", sha)
 			o.StartSHA = sha
 		}
 		if o.EndRev != "" && o.EndSHA == "" {
 			sha, err := repo.RevParse(o.EndRev)
 			if err != nil {
-				return err
+				return errors.Wrapf(err, "resolving %s", o.EndRev)
 			}
 			logrus.Infof("using found end SHA: %s", sha)
 			o.EndSHA = sha