135744 2014-08-07 21:35:10 -0700 commit-log-message has extra blank line at the top of pre-populated message 2014-08-08 01:09:30 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 joepeck webkit-unassigned commit-queue evab.u-szeged glenn joepeck mrowe ossy oldest_to_newest 1027767 0 joepeck 2014-08-07 21:35:10 -0700 * SUMMARY commit-log-message has extra blank line at the top of pre-populated message. * NOTES Caused by: <https://webkit.org/b/131727> Fix the commit-log-editor after r167243 and add more unit tests My work flow is something like: 1. Make change 2. git add files 3. prepare-ChangeLog --git-index 4. git add ChangeLogs 5. git commit => extra newline 1027769 1 joepeck 2014-08-07 21:41:13 -0700 In my case, I have a single ChangeLog entry, so the $commonPrefix is empty. The extra newline gets added because of: > if (!$commonPrefix) { > push @result, normalizeLineEndings("\n", $endl); > } 1027773 2 236264 joepeck 2014-08-07 21:51:18 -0700 Created attachment 236264 [PATCH] Proposed Fix 1027811 3 236264 ossy 2014-08-08 00:36:37 -0700 Comment on attachment 236264 [PATCH] Proposed Fix Sorry for the trouble and thanks for the fix. r=me. 1027817 4 236264 commit-queue 2014-08-08 01:09:27 -0700 Comment on attachment 236264 [PATCH] Proposed Fix Clearing flags on attachment: 236264 Committed r172339: <http://trac.webkit.org/changeset/172339> 1027818 5 commit-queue 2014-08-08 01:09:30 -0700 All reviewed patches have been landed. Closing bug. 236264 2014-08-07 21:51:18 -0700 2014-08-08 01:09:26 -0700 [PATCH] Proposed Fix fix-commit-message.patch text/plain 3340 joepeck Y29tbWl0IGUwMmEzYWJmOWQ2NDk1MjYwY2JlZDIxNTIwMWEwNGYyZjIxMjRiZmUKQXV0aG9yOiBK b3NlcGggUGVjb3Jhcm8gPHBlY29yYXJvQGFwcGxlLmNvbT4KRGF0ZTogICBUaHUgQXVnIDcgMjE6 NTA6MzAgMjAxNCAtMDcwMAoKICAgIGNvbW1pdC1sb2ctbWVzc2FnZSBoYXMgZXh0cmEgYmxhbmsg bGluZSBhdCB0aGUgdG9wIG9mIHByZS1wb3B1bGF0ZWQgbWVzc2FnZQogICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNTc0NAogICAgCiAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KICAgIAogICAgRG8gbm90IGFkZCBhIGJsYW5rIGxlYWRpbmcgbGluZSBp biBzaW5nbGUgQ2hhbmdlTG9nIGNvbW1pdCBtZXNzYWdlcy4KICAgIAogICAgKiBTY3JpcHRzL2Nv bW1pdC1sb2ctZWRpdG9yOgogICAgKGNyZWF0ZUNvbW1pdE1lc3NhZ2UpOgogICAgKiBTY3JpcHRz L3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9jaGVja291dF91bml0dGVzdC5weToKICAgICh0ZXN0 X2NvbW1pdF9tZXNzYWdlX2Zvcl9vbmVfcmV2aWV3ZWRfY2hhbmdlbG9nKToKICAgICh0ZXN0X2Nv bW1pdF9tZXNzYWdlX2Zvcl9vbmVfcm9sbG91dF9jaGFuZ2Vsb2cpOgoKZGlmZiAtLWdpdCBhL1Rv b2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAxZWZkNDQwLi4zNmM0MTE2IDEw MDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUg KzEsMjAgQEAKIDIwMTQtMDgtMDcgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNv bT4KIAorICAgICAgICBjb21taXQtbG9nLW1lc3NhZ2UgaGFzIGV4dHJhIGJsYW5rIGxpbmUgYXQg dGhlIHRvcCBvZiBwcmUtcG9wdWxhdGVkIG1lc3NhZ2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNTc0NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIERvIG5vdCBhZGQgYSBibGFuayBsZWFkaW5nIGxpbmUg aW4gc2luZ2xlIENoYW5nZUxvZyBjb21taXQgbWVzc2FnZXMuCisKKyAgICAgICAgKiBTY3JpcHRz L2NvbW1pdC1sb2ctZWRpdG9yOgorICAgICAgICAoY3JlYXRlQ29tbWl0TWVzc2FnZSk6CisgICAg ICAgICogU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvY2hlY2tvdXRfdW5pdHRlc3Qu cHk6CisgICAgICAgICh0ZXN0X2NvbW1pdF9tZXNzYWdlX2Zvcl9vbmVfcmV2aWV3ZWRfY2hhbmdl bG9nKToKKyAgICAgICAgKHRlc3RfY29tbWl0X21lc3NhZ2VfZm9yX29uZV9yb2xsb3V0X2NoYW5n ZWxvZyk6CisKKzIwMTQtMDgtMDcgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNv bT4KKwogICAgICAgICBtYWtlIGNsZWFuIGRvZXMgbm90IHdvcmsgaW4gT3BlblNvdXJjZSwgZmFp bHMgaW4gV2ViS2l0TGlicmFyaWVzCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMzU3MzQKIApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9jb21taXQt bG9nLWVkaXRvciBiL1Rvb2xzL1NjcmlwdHMvY29tbWl0LWxvZy1lZGl0b3IKaW5kZXggZjViNDIx Mi4uNTcwZWZhYSAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy9jb21taXQtbG9nLWVkaXRvcgor KysgYi9Ub29scy9TY3JpcHRzL2NvbW1pdC1sb2ctZWRpdG9yCkBAIC0zNDYsOSArMzQ2LDYgQEAg c3ViIGNyZWF0ZUNvbW1pdE1lc3NhZ2UoQCkKICAgICAgICAgICAgIHB1c2ggQHJlc3VsdCwgbm9y bWFsaXplTGluZUVuZGluZ3MoIlxuIiwgJGVuZGwpOwogICAgICAgICAgICAgcHVzaCBAcmVzdWx0 LCBub3JtYWxpemVMaW5lRW5kaW5ncygiJGxhYmVsOlxuIiwgJGVuZGwpOwogICAgICAgICB9Ci0g ICAgICAgIGlmICghJGNvbW1vblByZWZpeCkgewotICAgICAgICAgICAgcHVzaCBAcmVzdWx0LCBu b3JtYWxpemVMaW5lRW5kaW5ncygiXG4iLCAkZW5kbCk7Ci0gICAgICAgIH0KICAgICAgICAgcHVz aCBAcmVzdWx0LCBub3JtYWxpemVMaW5lRW5kaW5ncygkY2hhbmdlTG9nQ29udGVudHN7JGxhYmVs fSwgJGVuZGwpOwogICAgIH0KIApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9j b21tb24vY2hlY2tvdXQvY2hlY2tvdXRfdW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2NvbW1vbi9jaGVja291dC9jaGVja291dF91bml0dGVzdC5weQppbmRleCA1OGRiOWIxLi42 YjJkYzc0IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291 dC9jaGVja291dF91bml0dGVzdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1v bi9jaGVja291dC9jaGVja291dF91bml0dGVzdC5weQpAQCAtMjA1LDggKzIwNSw3IEBAIFNlY29u ZCBwYXJ0IG9mIHRoaXMgY29tcGxpY2F0ZWQgY2hhbmdlIGJ5IG1lLCBUb3IgQXJuZSBWZXN0Ylx1 MDBmOCEKICAgICAgICAgc2VsZi5hc3NlcnRNdWx0aUxpbmVFcXVhbChjb21taXRfbWVzc2FnZS5t ZXNzYWdlKCksIGV4cGVjdGVkX2NvbW1pdF9tZXNzYWdlKQogCiAgICAgZGVmIHRlc3RfY29tbWl0 X21lc3NhZ2VfZm9yX29uZV9yZXZpZXdlZF9jaGFuZ2Vsb2coc2VsZik6Ci0gICAgICAgIGV4cGVj dGVkX2NvbW1pdF9tZXNzYWdlID0gdSIiIgotU0VDVE9SREVSX0ZMQUdTIHNob3VsZCBiZSBkZWZp bmVkIGluIHRhcmdldCdzIHhjY29uZmlnIGZpbGUsIG5vdCBCYXNlLnhjY29uZmlnCisgICAgICAg IGV4cGVjdGVkX2NvbW1pdF9tZXNzYWdlID0gdSIiIlNFQ1RPUkRFUl9GTEFHUyBzaG91bGQgYmUg ZGVmaW5lZCBpbiB0YXJnZXQncyB4Y2NvbmZpZyBmaWxlLCBub3QgQmFzZS54Y2NvbmZpZwogPGh0 dHA6Ly93ZWJraXQub3JnL2IvMTM1MDA2PgogCiBQYXRjaCBieSBEYXZpZCBLaWx6ZXIgPGRka2ls emVyQGFwcGxlLmNvbT4gb24gMjAxNC0wNy0xNwpAQCAtMjgwLDggKzI3OSw3IEBAIEZpbGxlciBj aGFuZ2UuCiAgICAgICAgIHNlbGYuYXNzZXJ0TXVsdGlMaW5lRXF1YWwoY29tbWl0X21lc3NhZ2Uu bWVzc2FnZSgpLCBleHBlY3RlZF9jb21taXRfbWVzc2FnZSkKIAogICAgIGRlZiB0ZXN0X2NvbW1p dF9tZXNzYWdlX2Zvcl9vbmVfcm9sbG91dF9jaGFuZ2Vsb2coc2VsZik6Ci0gICAgICAgIGV4cGVj dGVkX2NvbW1pdF9tZXNzYWdlID0gdSIiIgotUm9sbGluZyBvdXQgcjE3MDM0MCBhbmQgcjE3MDMz OS4KKyAgICAgICAgZXhwZWN0ZWRfY29tbWl0X21lc3NhZ2UgPSB1IiIiUm9sbGluZyBvdXQgcjE3 MDM0MCBhbmQgcjE3MDMzOS4KIAogQ2hhbmdlc2V0IHIxNzAzMzkgYnJva2UgdGhlIEFwcGxlIFdp bmRvd3MgRGVidWcgYW5kIFJlbGVhc2UgYnVpbGRzLgogCg==