Fix tag message option hidden

spenserblack · spenserblack · commit e8dfa9e72893 · 2022-01-12T09:36:29.000-05:00
This fixes the option in `gh release create` to generate release notes from the tag message being hidden whenever generated notes are available. This changes the behavior from hiding "generate from tag" and "generate from commit log" being hidden to *only* the "generate from commit log" option being hidden. Fixes cli#5027
diff --git a/pkg/cmd/release/create/create.go b/pkg/cmd/release/create/create.go
@@ -234,7 +234,7 @@ func createRun(opts *CreateOptions) error {
 			return err
 		}
 
-		if opts.RepoOverride == "" && generatedNotes == nil {
+		if opts.RepoOverride == "" {
 			headRef := opts.TagName
 			tagDescription, _ = gitTagInfo(opts.TagName)
 			if tagDescription == "" {
@@ -245,9 +245,11 @@ func createRun(opts *CreateOptions) error {
 					headRef = "HEAD"
 				}
 			}
-			if prevTag, err := detectPreviousTag(headRef); err == nil {
-				commits, _ := changelogForRange(fmt.Sprintf("%s..%s", prevTag, headRef))
-				generatedChangelog = generateChangelog(commits)
+			if generatedNotes == nil {
+				if prevTag, err := detectPreviousTag(headRef); err == nil {
+					commits, _ := changelogForRange(fmt.Sprintf("%s..%s", prevTag, headRef))
+					generatedChangelog = generateChangelog(commits)
+				}
 			}
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -234,7 +234,7 @@ func createRun(opts *CreateOptions) error {`
`234`	`234`	`return err`
`235`	`235`	`}`
`236`	`236`
`237`		`- if opts.RepoOverride == "" && generatedNotes == nil {`
	`237`	`+ if opts.RepoOverride == "" {`
`238`	`238`	`headRef := opts.TagName`
`239`	`239`	`tagDescription, _ = gitTagInfo(opts.TagName)`
`240`	`240`	`if tagDescription == "" {`
`@@ -245,9 +245,11 @@ func createRun(opts *CreateOptions) error {`
`245`	`245`	`headRef = "HEAD"`
`246`	`246`	`}`
`247`	`247`	`}`
`248`		`- if prevTag, err := detectPreviousTag(headRef); err == nil {`
`249`		`- commits, _ := changelogForRange(fmt.Sprintf("%s..%s", prevTag, headRef))`
`250`		`- generatedChangelog = generateChangelog(commits)`
	`248`	`+ if generatedNotes == nil {`
	`249`	`+ if prevTag, err := detectPreviousTag(headRef); err == nil {`
	`250`	`+ commits, _ := changelogForRange(fmt.Sprintf("%s..%s", prevTag, headRef))`
	`251`	`+ generatedChangelog = generateChangelog(commits)`
	`252`	`+ }`
`251`	`253`	`}`
`252`	`254`	`}`
`253`	`255`