<?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>242318</bug_id>
          
          <creation_ts>2022-07-04 12:30:51 -0700</creation_ts>
          <short_desc>git-webkit upload should amend the commit instead of making a new commit</short_desc>
          <delta_ts>2023-01-18 11:24:01 -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>NEW</bug_status>
          <resolution></resolution>
          
          <see_also>https://bugs.webkit.org/show_bug.cgi?id=240607</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="Ryosuke Niwa">rniwa</reporter>
          <assigned_to name="Nobody">webkit-unassigned</assigned_to>
          <cc>ap</cc>
    
    <cc>jbedard</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1880569</commentid>
    <comment_count>0</comment_count>
    <who name="Ryosuke Niwa">rniwa</who>
    <bug_when>2022-07-04 12:30:51 -0700</bug_when>
    <thetext>git-webkit upload should amend the commit instead of trying to create a new commit in each invocation.

Looks like this option exists but not enabled by default? --amend.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1880868</commentid>
    <comment_count>1</comment_count>
    <who name="Alexey Proskuryakov">ap</who>
    <bug_when>2022-07-05 19:20:30 -0700</bug_when>
    <thetext>There isn&apos;t consensus on the right behavior yet - some people prefer additional changes to be separate commits to make reviewing easier. And then squash before landing.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1880879</commentid>
    <comment_count>2</comment_count>
    <who name="Ryosuke Niwa">rniwa</who>
    <bug_when>2022-07-05 20:29:34 -0700</bug_when>
    <thetext>(In reply to Alexey Proskuryakov from comment #1)
&gt; There isn&apos;t consensus on the right behavior yet - some people prefer
&gt; additional changes to be separate commits to make reviewing easier. And then
&gt; squash before landing.

Maybe this should be configurable during setup?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1882094</commentid>
    <comment_count>3</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2022-07-11 12:31:16 -0700</bug_when>
    <thetext>&lt;rdar://problem/96837043&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1884613</commentid>
    <comment_count>4</comment_count>
    <who name="Ryosuke Niwa">rniwa</who>
    <bug_when>2022-07-16 21:34:08 -0700</bug_when>
    <thetext>So... apparently merge-queue can&apos;t land a PR unless all commits are squashed so the current behavior of git-webkit upload is incompatible with merge queue.</thetext>
  </long_desc>
      
      

    </bug>

</bugzilla>