<?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>149209</bug_id>
          
          <creation_ts>2015-09-16 00:11:23 -0700</creation_ts>
          <short_desc>prepare-ChangeLog skips modified function if Git is configured with diff.mnemonicprefix</short_desc>
          <delta_ts>2015-09-16 07:23:25 -0700</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>All</rep_platform>
          <op_sys>All</op_sys>
          <bug_status>NEW</bug_status>
          <resolution></resolution>
          
          
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords></keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Ansh Shukla">ansh_shukla</reporter>
          <assigned_to name="Nobody">webkit-unassigned</assigned_to>
          <cc>dbates</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1126300</commentid>
    <comment_count>0</comment_count>
    <who name="Ansh Shukla">ansh_shukla</who>
    <bug_when>2015-09-16 00:11:23 -0700</bug_when>
    <thetext>Users who have ``git config diff.mnemonicprefix=true`` will not have modified functions listed in their ChangeLog because diffHeaderFormat() is looking for headers of the form: ``return qr/^diff --git a\/.+ b\/(.+)$/ if isGit();``, but mnemonicprefix will change &quot;a&quot; and &quot;b&quot; to &apos;i&apos;, &apos;w&apos;, &apos;c&apos;, or &apos;o&apos;.

I think it&apos;s better to fix by changing the config for the diff command via option ``-c diff.mnemonicprefix=false``, but am open to other suggestions (e.g. changing the RegEx).</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1126303</commentid>
    <comment_count>1</comment_count>
      <attachid>261300</attachid>
    <who name="Ansh Shukla">ansh_shukla</who>
    <bug_when>2015-09-16 00:18:46 -0700</bug_when>
    <thetext>Created attachment 261300
Patch to fix by adding ``-c diff.mnemonicprefix=false`` to invocation.

This patch fixes the bug by ensuring that prepare-ChangeLog sets the expected configuration for ``git diff``.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>261300</attachid>
            <date>2015-09-16 00:18:46 -0700</date>
            <delta_ts>2015-09-16 07:23:25 -0700</delta_ts>
            <desc>Patch to fix by adding ``-c diff.mnemonicprefix=false`` to invocation.</desc>
            <filename>0001-Add-option-to-set-diff.mnemonicprefix-to-false-so-th.patch</filename>
            <type>text/plain</type>
            <size>2784</size>
            <attacher name="Ansh Shukla">ansh_shukla</attacher>
            
              <data encoding="base64">RnJvbSBiYWYzY2UxMTBhMTJiM2JmZGQxOGQ0NjUyZjBkNzNkNDFmNDFhZGVjIE1vbiBTZXAgMTcg
MDA6MDA6MDAgMjAwMQpGcm9tOiBBbnNoIFNodWtsYSA8YW5zaF9zaHVrbGFAYXBwbGUuY29tPgpE
YXRlOiBXZWQsIDE2IFNlcCAyMDE1IDAwOjE2OjMxIC0wNzAwClN1YmplY3Q6IFtQQVRDSF0gCQkJ
CUFkZCBvcHRpb24gdG8gc2V0CiBgYGRpZmYubW5lbW9uaWNwcmVmaXhgYCB0byBmYWxzZSBzbyB0
aGF0IHByZXBhcmUtQ2hhbmdlTG9nIGNhbiBwcm9wZXJseSByZWFkIAogCQkJYGBnaXQgZGlmZmBg
LiAJCQkKIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDkyMDkKClJl
dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKCQkJCVdoZW4gYGBkaWZmLm1uZW1vbmljcHJlZml4
YGAgaXMgc2V0IHRvIHRydWUsIGdpdCBjaGFuZ2VzIHRoZSBwcmVmaXhlcyBpbiBoZWFkZXJzIG9m
IGRpZmZzLgoJCQkJQmVjYXVzZSBwcmVmaXhlcyBhcmUgaGFyZGNvZGVkIGludG8gdGhlIGhlYWRl
ciBwYXJzaW5nIHJlZ2V4LCB0aGlzIHByZXZlbnRzCgkJCQlwcmVwYXJlLUNoYW5nZUxvZyBmcm9t
IHByb3Blcmx5IGlkZW50aWZ5aW5nIG1vZGlmaWVkIGZ1bmN0aW9ucy4KCiogU2NyaXB0cy9wcmVw
YXJlLUNoYW5nZUxvZzoKKGRpZmZDb21tYW5kKTogYWRkZWQgb3B0aW9uIGBgLWMgZGlmZi5tbmVt
b25pY3ByZWZpeD1mYWxzZWBgIHRvIHRoZSBpbnZvY2F0aW9uLgotLS0KIFRvb2xzL0NoYW5nZUxv
ZyAgICAgICAgICAgICAgICAgfCAxNSArKysrKysrKysrKysrKysKIFRvb2xzL1NjcmlwdHMvcHJl
cGFyZS1DaGFuZ2VMb2cgfCAgNCArKy0tCiAyIGZpbGVzIGNoYW5nZWQsIDE3IGluc2VydGlvbnMo
KyksIDIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMv
Q2hhbmdlTG9nCmluZGV4IDdjMzZkOTQuLjUzYThjNTkgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5n
ZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAxNS0wOS0xNSAg
QW5zaCBTaHVrbGEgIDxhbnNoX3NodWtsYUBhcHBsZS5jb20+CisKKwkJCQlBZGQgb3B0aW9uIHRv
IHNldCBgYGRpZmYubW5lbW9uaWNwcmVmaXhgYCB0byBmYWxzZSBzbyB0aGF0IHByZXBhcmUtQ2hh
bmdlTG9nIGNhbiBwcm9wZXJseSByZWFkCisJCQkJYGBnaXQgZGlmZmBgLgorCQkJCWh0dHBzOi8v
YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDkyMDkKKworICAgICAgICBSZXZpZXdl
ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworCQkJCVdoZW4gYGBkaWZmLm1uZW1vbmljcHJlZml4YGAg
aXMgc2V0IHRvIHRydWUsIGdpdCBjaGFuZ2VzIHRoZSBwcmVmaXhlcyBpbiBoZWFkZXJzIG9mIGRp
ZmZzLgorCQkJCUJlY2F1c2UgcHJlZml4ZXMgYXJlIGhhcmRjb2RlZCBpbnRvIHRoZSBoZWFkZXIg
cGFyc2luZyByZWdleCwgdGhpcyBwcmV2ZW50cworCQkJCXByZXBhcmUtQ2hhbmdlTG9nIGZyb20g
cHJvcGVybHkgaWRlbnRpZnlpbmcgbW9kaWZpZWQgZnVuY3Rpb25zLgorCisgICAgICAgICogU2Ny
aXB0cy9wcmVwYXJlLUNoYW5nZUxvZzoKKyAgICAgICAgKGRpZmZDb21tYW5kKTogYWRkZWQgb3B0
aW9uIGBgLWMgZGlmZi5tbmVtb25pY3ByZWZpeD1mYWxzZWBgIHRvIHRoZSBpbnZvY2F0aW9uLgor
CiAyMDE1LTA5LTE0ICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CiAK
ICAgICAgICAgV2ViS2l0VGVzdFJ1bm5lciBkZWNsYXJhdGl2ZSBsYW5ndWFnZSBzZXR0aW5nIGlz
IGJyb2tlbiBmb3IgaU9TCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3ByZXBhcmUtQ2hhbmdl
TG9nIGIvVG9vbHMvU2NyaXB0cy9wcmVwYXJlLUNoYW5nZUxvZwppbmRleCBjNGJjNDcwLi5hMWM5
Y2JkIDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL3ByZXBhcmUtQ2hhbmdlTG9nCisrKyBiL1Rv
b2xzL1NjcmlwdHMvcHJlcGFyZS1DaGFuZ2VMb2cKQEAgLTE4ODcsMTAgKzE4ODcsMTAgQEAgc3Vi
IGRpZmZDb21tYW5kKCQkJCQpCiAgICAgaWYgKGlzU1ZOKCkpIHsKICAgICAgICAgbXkgQGVzY2Fw
ZWRQYXRocyA9IG1hcChlc2NhcGVTdWJ2ZXJzaW9uUGF0aCgkXyksIEAkcGF0aHMpOwogICAgICAg
ICBteSAkZXNjYXBlZFBhdGhzU3RyaW5nID0gIiciIC4gam9pbigiJyAnIiwgQGVzY2FwZWRQYXRo
cykgLiAiJyI7Ci0gICAgICAgICRjb21tYW5kID0gU1ZOIC4gIiBkaWZmIC0tZGlmZi1jbWQgZGlm
ZiAteCAtdSAkZXNjYXBlZFBhdGhzU3RyaW5nIjsKKyAgICAgICAgJGNvbW1hbmQgPSBTVk4gLiAi
IC1jIGRpZmYubW5lbW9uaWNwcmVmaXg9ZmFsc2UgZGlmZiAtLWRpZmYtY21kIGRpZmYgLXggLXUg
JGVzY2FwZWRQYXRoc1N0cmluZyI7CiAgICAgfSBlbHNpZiAoaXNHaXQoKSkgewogICAgICAgICBt
eSAkcGF0aHNTdHJpbmcgPSAiJyIgLiBqb2luKCInICciLCBAJHBhdGhzKSAuICInIjsgCi0gICAg
ICAgICRjb21tYW5kID0gR0lUIC4gIiBkaWZmIC0tbm8tZXh0LWRpZmYgLVUwICIgLiBkaWZmRnJv
bVRvU3RyaW5nKCRnaXRDb21taXQsICRnaXRJbmRleCwgJG1lcmdlQmFzZSk7CisgICAgICAgICRj
b21tYW5kID0gR0lUIC4gIiAtYyBkaWZmLm1uZW1vbmljcHJlZml4PWZhbHNlIGRpZmYgLS1uby1l
eHQtZGlmZiAtVTAgIiAuIGRpZmZGcm9tVG9TdHJpbmcoJGdpdENvbW1pdCwgJGdpdEluZGV4LCAk
bWVyZ2VCYXNlKTsKICAgICAgICAgJGNvbW1hbmQgLj0gIiAtLSAkcGF0aHNTdHJpbmciIHVubGVz
cyAkZ2l0Q29tbWl0IG9yICRtZXJnZUJhc2U7CiAgICAgfQogCi0tIAoyLjUuMQoK
</data>

          </attachment>
      

    </bug>

</bugzilla>