From e8dfa9e72893b004e49d96cf45c12caf2acce2df Mon Sep 17 00:00:00 2001 From: Spenser Black Date: Wed, 12 Jan 2022 09:21:41 -0500 Subject: [PATCH] Fix tag message option hidden 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 #5027 --- pkg/cmd/release/create/create.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkg/cmd/release/create/create.go b/pkg/cmd/release/create/create.go index 1b834373f..96f7245c1 100644 --- 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) + } } }