Bug 257363 - [git-webkit] Only reset local main when it contains local commits
Summary: [git-webkit] Only reset local main when it contains local commits
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: Nobody
URL:
Keywords: InRadar
Depends on:
Blocks:
 
Reported: 2023-05-25 17:10 PDT by Jonathan Bedard
Modified: 2023-05-25 17:25 PDT (History)
1 user (show)

See Also:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Jonathan Bedard 2023-05-25 17:10:07 PDT 
Currently, git-webkit pr will unconditionally set the local main reference to point to the remote reference. This is so that we can seamlessly allow contributors to create a commit on `main` and then put that commit into a PR and let the engineer return their checkout to the canonical main. If we attempt to set the local main reference to the remote when it's already on the remote, though, that command will fail.
Comment 1 Radar WebKit Bug Importer 2023-05-25 17:10:29 PDT 
<rdar://problem/109860518>
Comment 2 Jonathan Bedard 2023-05-25 17:24:57 PDT 
Committed 264544@main (bb0606c): https://commits.webkit.org/264544@main