<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<!DOCTYPE bugzilla SYSTEM "https://bugs.webkit.org/page.cgi?id=bugzilla.dtd">

<bugzilla version="5.0.4.1"
          urlbase="https://bugs.webkit.org/"
          
          maintainer="admin@webkit.org"
>

    <bug>
          <bug_id>239385</bug_id>
          
          <creation_ts>2022-04-15 07:47:54 -0700</creation_ts>
          <short_desc>[git-webkit] Make the default rebase behavior for `git-webkit pr` configurable</short_desc>
          <delta_ts>2023-01-20 00:17:41 -0800</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>Tools / Tests</component>
          <version>WebKit Nightly Build</version>
          <rep_platform>Unspecified</rep_platform>
          <op_sys>Unspecified</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          <see_also>https://bugs.webkit.org/show_bug.cgi?id=250888</see_also>
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords>InRadar</keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          
          <blocked>239082</blocked>
          <everconfirmed>1</everconfirmed>
          <reporter name="Antoine Quint">graouts</reporter>
          <assigned_to name="Jonathan Bedard">jbedard</assigned_to>
          <cc>jbedard</cc>
    
    <cc>rego</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1861803</commentid>
    <comment_count>0</comment_count>
    <who name="Antoine Quint">graouts</who>
    <bug_when>2022-04-15 07:47:54 -0700</bug_when>
    <thetext>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&amp;cid=C01C94S4C6M to &quot;gate the default on a .git/config setting and prompt folks when running git-webkit setup&quot;.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1861827</commentid>
    <comment_count>1</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2022-04-15 09:26:15 -0700</bug_when>
    <thetext>&lt;rdar://problem/91811534&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1861829</commentid>
    <comment_count>2</comment_count>
    <who name="Jonathan Bedard">jbedard</who>
    <bug_when>2022-04-15 09:35:17 -0700</bug_when>
    <thetext>Pull request: https://github.com/WebKit/WebKit/pull/295</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1868674</commentid>
    <comment_count>3</comment_count>
    <who name="Manuel Rego Casasnovas">rego</who>
    <bug_when>2022-05-13 01:02:26 -0700</bug_when>
    <thetext>I agree, rebases are very time consuming, and I believe by default it shouldn&apos;t do a rebase. That&apos;s what webkit-patch has been doing for years.

Can we change the default in addition to making it configurable?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1875355</commentid>
    <comment_count>4</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2022-06-10 18:33:57 -0700</bug_when>
    <thetext>Committed r295470 (251475@main): &lt;https://commits.webkit.org/251475@main&gt;

Reviewed commits have been landed. Closing PR #295 and removing active labels.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1875535</commentid>
    <comment_count>5</comment_count>
    <who name="Jonathan Bedard">jbedard</who>
    <bug_when>2022-06-13 09:38:52 -0700</bug_when>
    <thetext>(In reply to Manuel Rego Casasnovas from comment #3)
&gt; I agree, rebases are very time consuming, and I believe by default it
&gt; shouldn&apos;t do a rebase. That&apos;s what webkit-patch has been doing for years.
&gt; 
&gt; 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).</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1926828</commentid>
    <comment_count>6</comment_count>
    <who name="Antoine Quint">graouts</who>
    <bug_when>2023-01-20 00:17:41 -0800</bug_when>
    <thetext>Making this default to &quot;No&quot; during `git webkit setup` in bug 250888.</thetext>
  </long_desc>
      
      

    </bug>

</bugzilla>