Bug 239329 - [git-webkit] Personal branch is "not a PR branch"
Summary: [git-webkit] Personal branch is "not a PR branch"
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: Tools / Tests (show other bugs)
Version: WebKit Nightly Build
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Jonathan Bedard
URL:
Keywords: InRadar
Depends on:
Blocks: 239082
  Show dependency treegraph
 
Reported: 2022-04-14 05:05 PDT by Antoine Quint
Modified: 2022-04-14 14:16 PDT (History)
3 users (show)

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Antoine Quint 2022-04-14 05:05:57 PDT
I've been working on a bug and created a local branch "macos-preview-cleanup" off main using `git checkout -b macos-preview-cleanup` which I then pushed to my fork. My remotes are listed as such:

fork	git@github.com:graouts/WebKit.git (fetch)
fork	git@github.com:graouts/WebKit.git (push)
graouts	git@github.com:graouts/WebKit.git (fetch)
graouts	git@github.com:graouts/WebKit.git (push)
origin	git@github.com:WebKit/WebKit.git (fetch)
origin	git@github.com:WebKit/WebKit.git (push)

So my branch is set to track "graouts/macos-preview-cleanup"

I created my ChangeLog prior to starting the PR process using `prepare-ChangeLog -o --merge-base main -b XXXXXX`. Then I ran the following and things didn't work:

OpenSource > git-webkit pr
'macos-preview-cleanup' is not a pull request branch, enter name of new branch (or bug URL): ^C
User interrupted program

I would have expected that my branch which is already pushed to a remote should be able to be used as-is for a pull request.
Comment 1 Radar WebKit Bug Importer 2022-04-14 08:58:40 PDT
<rdar://problem/91756286>
Comment 2 Jonathan Bedard 2022-04-14 09:07:47 PDT
Pull request: https://github.com/WebKit/WebKit/pull/290
Comment 3 Michael Catanzaro 2022-04-14 10:08:46 PDT
(In reply to Jonathan Bedard from comment #2)
> Pull request: https://github.com/WebKit/WebKit/pull/290

This probably/mostly also fixes bug #239126, yes?
Comment 4 Jonathan Bedard 2022-04-14 10:36:08 PDT
(In reply to Michael Catanzaro from comment #3)
> (In reply to Jonathan Bedard from comment #2)
> > Pull request: https://github.com/WebKit/WebKit/pull/290
> 
> This probably/mostly also fixes bug #239126, yes?

It won't change what we're encouraging you to do, but yes, it will mean we support most flavors of personally created branches.

There is still the matter of EWS's pickiness regarding PRs from main branches, which we should continue to discuss in https://bugs.webkit.org/show_bug.cgi?id=239126.
Comment 5 EWS 2022-04-14 14:16:19 PDT
Committed r292890 (249660@main): <https://commits.webkit.org/249660@main>

Reviewed commits have been landed. Closing PR #290 and removing active labels.