Bug 239385 - [git-webkit] Make the default rebase behavior for `git-webkit pr` configurable
Summary: [git-webkit] Make the default rebase behavior for `git-webkit pr` configurable
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
Depends on:
Blocks: 239082
  Show dependency treegraph
 
Reported: 2022-04-15 07:47 PDT by Antoine Quint
Modified: 2023-01-20 00:17 PST (History)
3 users (show)

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Antoine Quint 2022-04-15 07:47:54 PDT
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".
Comment 1 Radar WebKit Bug Importer 2022-04-15 09:26:15 PDT
<rdar://problem/91811534>
Comment 2 Jonathan Bedard 2022-04-15 09:35:17 PDT
Pull request: https://github.com/WebKit/WebKit/pull/295
Comment 3 Manuel Rego Casasnovas 2022-05-13 01:02:26 PDT
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?
Comment 4 EWS 2022-06-10 18:33:57 PDT
Committed r295470 (251475@main): <https://commits.webkit.org/251475@main>

Reviewed commits have been landed. Closing PR #295 and removing active labels.
Comment 5 Jonathan Bedard 2022-06-13 09:38:52 PDT
(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).
Comment 6 Antoine Quint 2023-01-20 00:17:41 PST
Making this default to "No" during `git webkit setup` in bug 250888.