STACKITGit/cli
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #11300 from cli/revert-10547-dan/fix-title-and-body-pr-create-priority

Browse source 
Revert "Fix: `gh pr create` prioritize `--title` and `--body` over `--fill` when `--web` is present"
This commit is contained in:
Andy Feller 2025-07-14 17:34:58 -04:00 • committed by GitHub
commit dbff7c5655
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 12 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

20
pkg/cmd/pr/create/create.go
View file

@ -388,17 +388,13 @@ func createRun(opts *CreateOptions) error {
return err
}
if opts.TitleProvided {
state.Title = opts.Title
}
if opts.BodyProvided {
state.Body = opts.Body
}
var openURL string
if opts.WebMode {
if !(opts.Autofill || opts.FillFirst) {
state.Title = opts.Title
state.Body = opts.Body
}
if opts.Template != "" {
state.Template = opts.Template
}
@ -417,6 +413,14 @@ func createRun(opts *CreateOptions) error {
return previewPR(*opts, openURL)
}
if opts.TitleProvided {
state.Title = opts.Title
}
if opts.BodyProvided {
state.Body = opts.Body
}
existingPR, _, err := opts.Finder.Find(shared.FindOptions{
Selector: ctx.PRRefs.QualifiedHeadRef(),
BaseBranch: ctx.PRRefs.BaseRef(),

22
pkg/cmd/pr/create/create_test.go
View file

@ -1590,28 +1590,6 @@ func Test_createRun(t *testing.T) {
},
expectedOut: "https://github.com/OWNER/REPO/pull/12\n",
},
{
name: "web prioritize title and body over fill",
setup: func(opts *CreateOptions, t *testing.T) func() {
opts.WebMode = true
opts.HeadBranch = "feature"
opts.TitleProvided = true
opts.BodyProvided = true
opts.Title = "my title"
opts.Body = "my body"
opts.Autofill = true
return func() {}
},
cmdStubs: func(cs *run.CommandStubber) {
cs.Register(
"git -c log.ShowSignature=false log --pretty=format:%H%x00%s%x00%b%x00 --cherry origin/master...feature",
0,
"56b6f8bb7c9e3a30093cd17e48934ce354148e80\u0000second commit of pr\u0000\u0000\n"+
"3a9b48085046d156c5acce8f3b3a0532cd706a4a\u0000first commit of pr\u0000first commit description\u0000\n",
)
},
expectedBrowse: "https://github.com/OWNER/REPO/compare/master...feature?body=my+body&expand=1&title=my+title",
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {