diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-17 03:37:44 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-17 03:37:44 +0000 |
| commit | 3b243514ffc9f185000f0051fa109b9c3b534b46 (patch) | |
| tree | 2f7398af0fca7702785d94bdedd6ca9e1e543cb7 | |
| parent | 68262a2048d3253b279d990acdd403cdeaf5a83b (diff) | |
| download | ruby-3b243514ffc9f185000f0051fa109b9c3b534b46.tar.gz | |
* tool/merger.rb: remove borders from the commit message which is used
when the commit doesn't change ChangeLog.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34659 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rwxr-xr-x | tool/merger.rb | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Fri Feb 17 12:35:55 2012 NARUSE, Yui <naruse@ruby-lang.org> + + * tool/merger.rb: remove borders from the commit message which is used + when the commit doesn't change ChangeLog. + Fri Feb 17 11:50:11 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> * common.mk (btest, btest-ruby, test-sample test-knownbugs) diff --git a/tool/merger.rb b/tool/merger.rb index 6f82541e0d..ef24027452 100755 --- a/tool/merger.rb +++ b/tool/merger.rb @@ -153,7 +153,7 @@ else if log_svn.empty? log_svn = IO.popen %w'svn log ' + r + [q] do |f| f.read - end + end.sub(/\A-+\nr.*\n/, '').sub(/\n-+\n\z/, '').gsub(/^(?=\S)/, "\t") end a = %w'svn merge --accept=postpone' + r + [q] |