<?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>29317</bug_id>
          
          <creation_ts>2009-09-16 15:37:36 -0700</creation_ts>
          <short_desc>PrettyPatch displays last two lines of a git-format-patch diff strangely</short_desc>
          <delta_ts>2011-03-10 20:17:32 -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>528+ (Nightly build)</version>
          <rep_platform>All</rep_platform>
          <op_sys>All</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          
          <bug_file_loc>https://bugs.webkit.org/attachment.cgi?id=39615&amp;action=prettypatch</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="Eric Seidel (no email)">eric</reporter>
          <assigned_to name="Nobody">webkit-unassigned</assigned_to>
          <cc>abarth</cc>
    
    <cc>aroben</cc>
    
    <cc>cmarcelo</cc>
    
    <cc>commit-queue</cc>
    
    <cc>dbates</cc>
    
    <cc>ddkilzer</cc>
    
    <cc>eric</cc>
    
    <cc>webkit.review.bot</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>147647</commentid>
    <comment_count>0</comment_count>
    <who name="Eric Seidel (no email)">eric</who>
    <bug_when>2009-09-16 15:37:36 -0700</bug_when>
    <thetext>PrettyPatch displays diff strangely

https://bugs.webkit.org/attachment.cgi?id=39615&amp;action=prettypatch

Notice how there are no minus lines in the ChangeLog here:
https://bugs.webkit.org/attachment.cgi?id=39615

Maybe he edited the diff by hand?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>147650</commentid>
    <comment_count>1</comment_count>
    <who name="Eric Seidel (no email)">eric</who>
    <bug_when>2009-09-16 15:39:28 -0700</bug_when>
    <thetext>Same trouble here:
https://bugs.webkit.org/attachment.cgi?id=39658&amp;action=prettypatch

I think it might be related to git diffs.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>147658</commentid>
    <comment_count>2</comment_count>
    <who name="Adam Roben (:aroben)">aroben</who>
    <bug_when>2009-09-16 16:06:32 -0700</bug_when>
    <thetext>That&apos;s just how the last two lines of git-format-patch files always appear with PrettyPatch. The last two lines look like this:

-- 
1.6.0.4

This is certainly a bug in PrettyPatch.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>364069</commentid>
    <comment_count>3</comment_count>
      <attachid>85071</attachid>
    <who name="Caio Marcelo de Oliveira Filho">cmarcelo</who>
    <bug_when>2011-03-08 11:52:10 -0800</bug_when>
    <thetext>Created attachment 85071
patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>365422</commentid>
    <comment_count>4</comment_count>
    <who name="Caio Marcelo de Oliveira Filho">cmarcelo</who>
    <bug_when>2011-03-10 12:27:26 -0800</bug_when>
    <thetext>I think this will fix bug 19963 as well.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>365611</commentid>
    <comment_count>5</comment_count>
      <attachid>85071</attachid>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2011-03-10 16:06:31 -0800</bug_when>
    <thetext>Comment on attachment 85071
patch

Clearing flags on attachment: 85071

Committed r80782: &lt;http://trac.webkit.org/changeset/80782&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>365612</commentid>
    <comment_count>6</comment_count>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2011-03-10 16:06:34 -0800</bug_when>
    <thetext>All reviewed patches have been landed.  Closing bug.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>365698</commentid>
    <comment_count>7</comment_count>
    <who name="WebKit Review Bot">webkit.review.bot</who>
    <bug_when>2011-03-10 17:33:39 -0800</bug_when>
    <thetext>http://trac.webkit.org/changeset/80782 might have broken GTK Linux 32-bit Release</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>365788</commentid>
    <comment_count>8</comment_count>
    <who name="Caio Marcelo de Oliveira Filho">cmarcelo</who>
    <bug_when>2011-03-10 20:17:32 -0800</bug_when>
    <thetext>*** Bug 19963 has been marked as a duplicate of this bug. ***</thetext>
  </long_desc>
      
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>85071</attachid>
            <date>2011-03-08 11:52:10 -0800</date>
            <delta_ts>2011-03-10 16:06:31 -0800</delta_ts>
            <desc>patch</desc>
            <filename>0001-PrettyPatch-displays-last-two-lines-of-a-git-format-.patch</filename>
            <type>text/plain</type>
            <size>3401</size>
            <attacher name="Caio Marcelo de Oliveira Filho">cmarcelo</attacher>
            
              <data encoding="base64">RnJvbSA0ZDA4NjE1N2YwYzAxNmY0ZWE0YWNjOTVlNzQ4NGE2ZjM2YzM5Njc2IE1vbiBTZXAgMTcg
MDA6MDA6MDAgMjAwMQpGcm9tOiBDYWlvIE1hcmNlbG8gZGUgT2xpdmVpcmEgRmlsaG8gPGNhaW8u
b2xpdmVpcmFAb3BlbmJvc3NhLm9yZz4KRGF0ZTogVHVlLCA4IE1hciAyMDExIDE2OjQ4OjE5IC0w
MzAwClN1YmplY3Q6IFtQQVRDSF0gUHJldHR5UGF0Y2ggZGlzcGxheXMgbGFzdCB0d28gbGluZXMg
b2YgYSBnaXQtZm9ybWF0LXBhdGNoIGRpZmYgc3RyYW5nZWx5CiBodHRwczovL2J1Z3Mud2Via2l0
Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjkzMTcKClJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoK
SWYgdGhlIGRpZmYgc2VjdGlvbiBoYXMgZnVsbCByYW5nZSBpbmZvcm1hdGlvbiwgd2UgcGFyc2Ug
b25seSBlbm91Z2ggdG8gY292ZXIgdGhlCnJhbmdlLiBUaGlzIGF2b2lkcyBpbmNvcnJlY3RseSBz
aG93aW5nIHRyYWlsaW5nIGxpbmVzIChsaWtlIGdpdCBzaWduYXR1cmUpIGFzIHBhcnQKb2YgdGhl
IHBhdGNoLgoKKiBQcmV0dHlQYXRjaC9QcmV0dHlQYXRjaC5yYjoKLS0tCiBXZWJzaXRlcy9idWdz
LndlYmtpdC5vcmcvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICB8ICAgMTMgKysrKysrKysrKysr
KwogLi4uL2J1Z3Mud2Via2l0Lm9yZy9QcmV0dHlQYXRjaC9QcmV0dHlQYXRjaC5yYiAgICAgfCAg
IDE1ICsrKysrKysrKysrKy0tLQogMiBmaWxlcyBjaGFuZ2VkLCAyNSBpbnNlcnRpb25zKCspLCAz
IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1dlYnNpdGVzL2J1Z3Mud2Via2l0Lm9yZy9DaGFu
Z2VMb2cgYi9XZWJzaXRlcy9idWdzLndlYmtpdC5vcmcvQ2hhbmdlTG9nCmluZGV4IGEzYWQzMjcu
LmU1ODc5YmYgMTAwNjQ0Ci0tLSBhL1dlYnNpdGVzL2J1Z3Mud2Via2l0Lm9yZy9DaGFuZ2VMb2cK
KysrIGIvV2Vic2l0ZXMvYnVncy53ZWJraXQub3JnL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBA
CisyMDExLTAzLTA4ICBDYWlvIE1hcmNlbG8gZGUgT2xpdmVpcmEgRmlsaG8gIDxjYWlvLm9saXZl
aXJhQG9wZW5ib3NzYS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku
CisKKyAgICAgICAgUHJldHR5UGF0Y2ggZGlzcGxheXMgbGFzdCB0d28gbGluZXMgb2YgYSBnaXQt
Zm9ybWF0LXBhdGNoIGRpZmYgc3RyYW5nZWx5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu
b3JnL3Nob3dfYnVnLmNnaT9pZD0yOTMxNworCisgICAgICAgIElmIHRoZSBkaWZmIHNlY3Rpb24g
aGFzIGZ1bGwgcmFuZ2UgaW5mb3JtYXRpb24sIHdlIHBhcnNlIG9ubHkgZW5vdWdoIHRvIGNvdmVy
IHRoZQorICAgICAgICByYW5nZS4gVGhpcyBhdm9pZHMgaW5jb3JyZWN0bHkgc2hvd2luZyB0cmFp
bGluZyBsaW5lcyAobGlrZSBnaXQgc2lnbmF0dXJlKSBhcyBwYXJ0CisgICAgICAgIG9mIHRoZSBw
YXRjaC4KKworICAgICAgICAqIFByZXR0eVBhdGNoL1ByZXR0eVBhdGNoLnJiOgorCiAyMDExLTAy
LTI1ICBPamFuIFZhZmFpICA8b2phbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQg
YnkgQWRhbSBCYXJ0aC4KZGlmZiAtLWdpdCBhL1dlYnNpdGVzL2J1Z3Mud2Via2l0Lm9yZy9QcmV0
dHlQYXRjaC9QcmV0dHlQYXRjaC5yYiBiL1dlYnNpdGVzL2J1Z3Mud2Via2l0Lm9yZy9QcmV0dHlQ
YXRjaC9QcmV0dHlQYXRjaC5yYgppbmRleCBlZGM0M2M0Li4xOGY2NWE2IDEwMDY0NAotLS0gYS9X
ZWJzaXRlcy9idWdzLndlYmtpdC5vcmcvUHJldHR5UGF0Y2gvUHJldHR5UGF0Y2gucmIKKysrIGIv
V2Vic2l0ZXMvYnVncy53ZWJraXQub3JnL1ByZXR0eVBhdGNoL1ByZXR0eVBhdGNoLnJiCkBAIC02
NSw3ICs2NSw3IEBAIHByaXZhdGUKIAogICAgIFNUQVJUX09GX0JJTkFSWV9EQVRBX0ZPUk1BVCA9
IC9eWzAtOWEtekEtWlwrXC89XXsyMCx9LyAjIEFzc3VtZSAyMCBjaGFycyB3aXRob3V0IGEgc3Bh
Y2UgaXMgYmFzZTY0IGJpbmFyeSBkYXRhLgogCi0gICAgU1RBUlRfT0ZfU0VDVElPTl9GT1JNQVQg
PSAvXkBAIC0oXGQrKSg/OixcZCspPyBcKyhcZCspKD86LFxkKyk/IEBAXHMqKC4qKS8KKyAgICBT
VEFSVF9PRl9TRUNUSU9OX0ZPUk1BVCA9IC9eQEAgLShcZCspKD86LChcZCspKT8gXCsoXGQrKSg/
OiwoXGQrKSk/IEBAXHMqKC4qKS8KIAogICAgIFNUQVJUX09GX0VYVEVOVF9TVFJJTkcgPSAiJWMi
ICUgMAogICAgIEVORF9PRl9FWFRFTlRfU1RSSU5HID0gIiVjIiAlIDEKQEAgLTY2Nyw3ICs2Njcs
MTQgQEAgRU5ECiAgICAgICAgICAgICBsaW5lcy5sZW5ndGggPj0gMSBvciByYWlzZSAiRGlmZlNl
Y3Rpb24ucGFyc2Ugb25seSByZWNlaXZlZCAlZCBsaW5lcyIgJSBsaW5lcy5sZW5ndGgKIAogICAg
ICAgICAgICAgbWF0Y2hlcyA9IFNUQVJUX09GX1NFQ1RJT05fRk9STUFULm1hdGNoKGxpbmVzWzBd
KQotICAgICAgICAgICAgZnJvbSwgdG8gPSBbbWF0Y2hlc1sxXS50b19pLCBtYXRjaGVzWzJdLnRv
X2ldIHVubGVzcyBtYXRjaGVzLm5pbD8KKworICAgICAgICAgICAgaWYgbWF0Y2hlcworICAgICAg
ICAgICAgICAgIGZyb20sIHRvID0gW21hdGNoZXNbMV0udG9faSwgbWF0Y2hlc1szXS50b19pXQor
ICAgICAgICAgICAgICAgIGlmIG1hdGNoZXNbMl0gYW5kIG1hdGNoZXNbNF0KKyAgICAgICAgICAg
ICAgICAgICAgZnJvbV9lbmQgPSBmcm9tICsgbWF0Y2hlc1syXS50b19pCisgICAgICAgICAgICAg
ICAgICAgIHRvX2VuZCA9IHRvICsgbWF0Y2hlc1s0XS50b19pCisgICAgICAgICAgICAgICAgZW5k
CisgICAgICAgICAgICBlbmQKIAogICAgICAgICAgICAgQGJsb2NrcyA9IFtdCiAgICAgICAgICAg
ICBkaWZmX2Jsb2NrID0gbmlsCkBAIC03MDcsNiArNzE0LDggQEAgRU5ECiAgICAgICAgICAgICAg
ICAgICAgIGZyb20gKz0gMSB1bmxlc3MgZnJvbS5uaWw/CiAgICAgICAgICAgICAgICAgICAgIHRv
ICs9IDEgdW5sZXNzIHRvLm5pbD8KICAgICAgICAgICAgICAgICBlbmQKKworICAgICAgICAgICAg
ICAgIGJyZWFrIGlmIGZyb21fZW5kIGFuZCB0b19lbmQgYW5kIGZyb20gPT0gZnJvbV9lbmQgYW5k
IHRvID09IHRvX2VuZAogICAgICAgICAgICAgZW5kCiAKICAgICAgICAgICAgIGNoYW5nZXMgPSBb
IFsgW10sIFtdIF0gXQpAQCAtNzQ3LDcgKzc1Niw3IEBAIEVORAogICAgICAgICAgICAgICAgIGVu
ZAogICAgICAgICAgICAgZW5kCiAKLSAgICAgICAgICAgIEBibG9ja3MudW5zaGlmdChDb250ZXh0
TGluZS5uZXcobWF0Y2hlc1szXSkpIHVubGVzcyBtYXRjaGVzLm5pbD8gfHwgbWF0Y2hlc1szXS5l
bXB0eT8KKyAgICAgICAgICAgIEBibG9ja3MudW5zaGlmdChDb250ZXh0TGluZS5uZXcobWF0Y2hl
c1s1XSkpIHVubGVzcyBtYXRjaGVzLm5pbD8gfHwgbWF0Y2hlc1s1XS5lbXB0eT8KICAgICAgICAg
ZW5kCiAKICAgICAgICAgZGVmIHRvX2h0bWwKLS0gCjEuNy40Cgo=
</data>

          </attachment>
      

    </bug>

</bugzilla>