225460 2021-05-06 09:23:17 -0700 [webkit-patch] setup-git-clone uses master instead of main 2021-05-06 13:42:52 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 graouts jbedard aakash_jain dewei_zhu ews-watchlist glenn jbedard slewis webkit-bug-importer oldest_to_newest 1757440 0 graouts 2021-05-06 09:23:17 -0700 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. 1757512 1 jbedard 2021-05-06 11:10:22 -0700 *** Bug 225459 has been marked as a duplicate of this bug. *** 1757513 2 webkit-bug-importer 2021-05-06 11:11:30 -0700 <rdar://problem/77616439> 1757516 3 427907 jbedard 2021-05-06 11:16:17 -0700 Created attachment 427907 Patch 1757616 4 ews-feeder 2021-05-06 13:42:51 -0700 Committed r277115 (237413@main): <https://commits.webkit.org/237413@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 427907. 427907 2021-05-06 11:16:17 -0700 2021-05-06 13:42:52 -0700 Patch bug-225460-20210506111616.patch text/plain 1729 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI3NzEwMSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE0IEBACisyMDIxLTA1LTA2ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbd2Via2l0LXBhdGNoXSBzZXR1cC1naXQtY2xvbmUgdXNlcyBtYXN0ZXIg aW5zdGVhZCBvZiBtYWluCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMjU0NjAKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzc3NjE2NDM5PgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy93ZWJr aXRweS90b29sL2NvbW1hbmRzL3NldHVwZ2l0Y2xvbmUucHk6CisgICAgICAgIChTZXR1cEdpdENs b25lLmV4ZWN1dGUpOiBQYWlyIHRoZSByZW1vdGUgYnJhbmNoIHJlZiB3aXRoIHRoZSBTdm4gcmVt b3RlLgorCiAyMDIxLTA1LTA2ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAg ICAgICAgUkVHUkVTU0lPTiAocjI3MjQxND8pOiBbbWFjT1NdIFRlc3RXZWJLaXRBUEkuR1BVUHJv Y2Vzcy5DcmFzaFdoaWxlUGxheWluZ1ZpZGVvIGlzIGEgZmxha3kgZmFpbHVyZQpJbmRleDogVG9v bHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3NldHVwZ2l0Y2xvbmUucHkKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3NldHVwZ2l0Y2xv bmUucHkJKHJldmlzaW9uIDI3NzEwMSkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9j b21tYW5kcy9zZXR1cGdpdGNsb25lLnB5CSh3b3JraW5nIGNvcHkpCkBAIC00NiwxMiArNDYsMTMg QEAgY2xhc3MgU2V0dXBHaXRDbG9uZShDb21tYW5kKToKICAgICAgICAgICAgIHJldHVybgogCiAg ICAgICAgIHVzZXJuYW1lLCBlbWFpbCA9IHNlbGYuX2dldF91c2VybmFtZV9hbmRfZW1haWwodG9v bCkKKyAgICAgICAgcmVtb3RlX2JyYW5jaCA9IHRvb2wuc2NtKCkucmVtb3RlX2JyYW5jaF9yZWYo KQogCiAgICAgICAgICMgRklYTUU6IFdlIHNob3VsZG4ndCBiZSB1c2luZyBhIHByaXZhdGUgbWV0 aG9kLgogICAgICAgICBydW5fZ2l0ID0gdG9vbC5zY20oKS5fcnVuX2dpdAogICAgICAgICBydW5f Z2l0KFsicHVsbCJdKQogICAgICAgICBydW5fZ2l0KFsic3ZuIiwgImluaXQiLCAiLS1wcmVmaXg9 b3JpZ2luLyIsICItVCIsICJ0cnVuayIsICJodHRwczovL3N2bi53ZWJraXQub3JnL3JlcG9zaXRv cnkvd2Via2l0Il0pCi0gICAgICAgIHJ1bl9naXQoWyJjb25maWciLCAiLS1yZXBsYWNlIiwgInN2 bi1yZW1vdGUuc3ZuLmZldGNoIiwgInRydW5rOnJlZnMvcmVtb3Rlcy9vcmlnaW4vbWFzdGVyIl0p CisgICAgICAgIHJ1bl9naXQoWyJjb25maWciLCAiLS1yZXBsYWNlIiwgInN2bi1yZW1vdGUuc3Zu LmZldGNoIiwgInRydW5rOnt9Ii5mb3JtYXQocmVtb3RlX2JyYW5jaCldKQogICAgICAgICBydW5f Z2l0KFsic3ZuIiwgImZldGNoIl0pCiAKICAgICAgICAgcnVuX2dpdChbImNvbmZpZyIsICJ1c2Vy Lm5hbWUiLCB1c2VybmFtZV0pCg==