Bug 239385
| Summary: | [git-webkit] Make the default rebase behavior for `git-webkit pr` configurable | ||
|---|---|---|---|
| Product: | WebKit | Reporter: | Antoine Quint <graouts> |
| Component: | Tools / Tests | Assignee: | Jonathan Bedard <jbedard> |
| Status: | RESOLVED FIXED | ||
| Severity: | Normal | CC: | jbedard, rego, webkit-bug-importer |
| Priority: | P2 | Keywords: | InRadar |
| Version: | WebKit Nightly Build | ||
| Hardware: | Unspecified | ||
| OS: | Unspecified | ||
| See Also: | https://bugs.webkit.org/show_bug.cgi?id=250888 | ||
| Bug Depends on: | |||
| Bug Blocks: | 239082 | ||
Antoine Quint
I had the – to me – unpleasant experience with my first successful run of `git-webkit pr` that it defaults to rebasing. This is an extremely costly default for WebKit since build time can be long. Should we consider defaulting to --no-rebase to match what webkit-patch upload would do?
Regardless of what the default is, Jonathan suggested in https://webkit.slack.com/archives/C01C94S4C6M/p1650033807494789?thread_ts=1650026926.714759&cid=C01C94S4C6M to "gate the default on a .git/config setting and prompt folks when running git-webkit setup".
| Attachments | ||
|---|---|---|
| Add attachment proposed patch, testcase, etc. |
Radar WebKit Bug Importer
<rdar://problem/91811534>
Jonathan Bedard
Pull request: https://github.com/WebKit/WebKit/pull/295
Manuel Rego Casasnovas
I agree, rebases are very time consuming, and I believe by default it shouldn't do a rebase. That's what webkit-patch has been doing for years.
Can we change the default in addition to making it configurable?
EWS
Committed r295470 (251475@main): <https://commits.webkit.org/251475@main>
Reviewed commits have been landed. Closing PR #295 and removing active labels.
Jonathan Bedard
(In reply to Manuel Rego Casasnovas from comment #3)
> I agree, rebases are very time consuming, and I believe by default it
> shouldn't do a rebase. That's what webkit-patch has been doing for years.
>
> Can we change the default in addition to making it configurable?
This change means contributors will be prompted in `git-webkit setup` for their personal default. Rebases were already configurable on a command-by-command basis (with --no-rebase and --rebase).
Antoine Quint
Making this default to "No" during `git webkit setup` in bug 250888.