Bug 254020
| Summary: | `git-webkit pr` fails if main is checked out in another worktree | ||
|---|---|---|---|
| Product: | WebKit | Reporter: | Sam Sneddon [:gsnedders] <gsnedders> |
| Component: | Tools / Tests | Assignee: | Nobody <webkit-unassigned> |
| Status: | NEW | ||
| Severity: | Normal | CC: | jbedard, ryanhaddad, webkit-bug-importer |
| Priority: | P2 | Keywords: | InRadar |
| Version: | WebKit Nightly Build | ||
| Hardware: | Unspecified | ||
| OS: | Unspecified | ||
Sam Sneddon [:gsnedders]
% ./Tools/Scripts/git-webkit pr
fatal: cannot force update the branch 'main' checked out at '/Volumes/gsnedders/projects/Safari/OpenSource'
Failed to match 'main' to it's remote 'origin'
| Attachments | ||
|---|---|---|
| Add attachment proposed patch, testcase, etc. |
Sam Sneddon [:gsnedders]
I'm not sure why we're trying to update main at all, rather than just relying on origin/main? I definitely don't expect 'git-webkit pr' when run from branch 'my-super-engineering' to modify my 'main' branch.
Radar WebKit Bug Importer
<rdar://problem/107133130>
Sam Sneddon [:gsnedders]
To be specific, we run ['/usr/bin/git', 'branch', '-f', 'main', 'remotes/origin/main']
I just almost filed a new bug about this; this is with `git-webkit pr --no-add --no-rebase --no-commit` the only place where we try and mutate any local branch, which we shouldn't be doing.
There's no good reason for `git-webkit pr` to be resetting a local branch.