Bug 225460 - [webkit-patch] setup-git-clone uses master instead of main
Summary: [webkit-patch] setup-git-clone uses master instead of main
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
: 225459 (view as bug list)
Depends on:
Blocks:
 
Reported: 2021-05-06 09:23 PDT by Antoine Quint
Modified: 2021-05-06 13:42 PDT (History)
7 users (show)

See Also:

Attachments
Patch (1.69 KB, patch)
2021-05-06 11:16 PDT, Jonathan Bedard 		no flags Details | Formatted Diff | Diff
View All 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 Antoine Quint 2021-05-06 09:23:17 PDT 
Steps to reproduce:

1. git clone git://github.com/WebKit/WebKit.git
2. cd WebKit
3. Tools/Scripts/webkit-patch setup-git-clone

… wait a bit or kill it eventually (see bug 225459),

4. write some code
5. Tools/Scripts/webkit-patch upload

At this stage I get this error:

    WebKit > webkit-patch upload
    Failed to run "['git', 'merge-base', u'refs/remotes/origin/master', 'HEAD']" exit_code: 1 cwd: /Users/antoine/Downloads/WebKit

Indeed, if I run `git branch -a` I see an entry that says `remotes/origin/master`. This appears while `Tools/Scripts/webkit-patch setup-git-clone` is running.
Comment 1 Jonathan Bedard 2021-05-06 11:10:22 PDT 
*** Bug 225459 has been marked as a duplicate of this bug. ***
Comment 2 Radar WebKit Bug Importer 2021-05-06 11:11:30 PDT 
<rdar://problem/77616439>
Comment 3 Jonathan Bedard 2021-05-06 11:16:17 PDT 
Created attachment 427907 [details]
Patch
Comment 4 EWS 2021-05-06 13:42:51 PDT 
Committed r277115 (237413@main): <https://commits.webkit.org/237413@main>

All reviewed patches have been landed. Closing bug and clearing flags on attachment 427907 [details].