<?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>282952</bug_id>
          
          <creation_ts>2024-11-11 14:25:20 -0800</creation_ts>
          <short_desc>prepare-commit-msg hook adds &quot;Originally-landed-as&quot; as a new trailer block</short_desc>
          <delta_ts>2024-11-18 14:26:13 -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=266028</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>
          
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Sam Sneddon [:gsnedders]">gsnedders</reporter>
          <assigned_to name="Nobody">webkit-unassigned</assigned_to>
          <cc>bfan2</cc>
    
    <cc>emw</cc>
    
    <cc>jbedard</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>2074364</commentid>
    <comment_count>0</comment_count>
    <who name="Sam Sneddon [:gsnedders]">gsnedders</who>
    <bug_when>2024-11-11 14:25:20 -0800</bug_when>
    <thetext>prepare-commit-msg just does:

```
result += [&apos;&apos;, &apos;Originally-landed-as: {}&apos;.format(cherry_pick_metadata)]
```

This is notably less smart than how we canonicalize commits; see:

```
% git log bce91c8033e3^! d3ad1d842868^! --reverse
commit bce91c8033e3
Author: Kimmo Kinnunen &lt;kkinnunen@apple.com&gt;
Date:   Wed Apr 24 09:22:12 2024 -0700

    WebGL fails to compile shaders with out variables that are arrays and start with underscore
    rdar://126944294
    
    Reviewed by Chris Dumez.
    
    Integrates upstream commit:
    commit e0e91b8cbb2e096d2d009cd0d1fbe20d785f2263
    Author: Kimmo Kinnunen &lt;kkinnunen@apple.com&gt;
    Date:   Mon Apr 22 18:11:30 2024 -0700
    Metal: Fix rewritten out variables with underscores
    
    Fix compilation in case of output variables start with underscores.
    Make name emission always emit MSL name ANGLE_{name}, so that GLSL `_e`
    and `e` cannot clash. This regressed in angleproject:8558.
    
    Bug: b/335744344
    Change-Id: Ibae4dba4a24888acc1461582e69d48218ba11176
    Canonical link: https://commits.webkit.org/272448.959@safari-7618-branch

commit d3ad1d842868
Author: Kimmo Kinnunen &lt;kkinnunen@apple.com&gt;
Date:   Thu May 16 12:18:12 2024 -0700

    WebGL fails to compile shaders with out variables that are arrays and start with underscore
    rdar://126944294
    
    Reviewed by Chris Dumez.
    
    Integrates upstream commit:
    commit e0e91b8cbb2e096d2d009cd0d1fbe20d785f2263
    Author: Kimmo Kinnunen &lt;kkinnunen@apple.com&gt;
    Date:   Mon Apr 22 18:11:30 2024 -0700
    Metal: Fix rewritten out variables with underscores
    
    Fix compilation in case of output variables start with underscores.
    Make name emission always emit MSL name ANGLE_{name}, so that GLSL `_e`
    and `e` cannot clash. This regressed in angleproject:8558.
    
    Bug: b/335744344
    Change-Id: Ibae4dba4a24888acc1461582e69d48218ba11176
    
    Originally-landed-as: bce91c8033e3. rdar://128091308
    Canonical link: https://commits.webkit.org/278880@main
```</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>2075956</commentid>
    <comment_count>1</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2024-11-18 14:26:13 -0800</bug_when>
    <thetext>&lt;rdar://problem/140152633&gt;</thetext>
  </long_desc>
      
      

    </bug>

</bugzilla>