Bug 257363

Summary: [git-webkit] Only reset local main when it contains local commits
Product: WebKit Reporter: Jonathan Bedard <jbedard>
Component: Tools / TestsAssignee: Nobody <webkit-unassigned>
Status: RESOLVED FIXED    
Severity: Normal CC: webkit-bug-importer
Priority: P2 Keywords: InRadar
Version: WebKit Nightly Build   
Hardware: Unspecified   
OS: Unspecified   

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