diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-10-12 07:07:10 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-10-12 07:07:10 +0000 |
| commit | 727c8cdfe7d5769d403f180b539e08e0f03eae2f (patch) | |
| tree | ccd1d78aaa4c2f46c79e3e7b7332a6b36e6183d2 /tool | |
| parent | 1b4c99c0573719871ffa6491a3873adcff920c52 (diff) | |
* tool/merger.rb: now can merge revision(s) without --ticket again.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37154 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'tool')
| -rwxr-xr-x | tool/merger.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tool/merger.rb b/tool/merger.rb index b7ceb86df3..d3bc0e9edc 100755 --- a/tool/merger.rb +++ b/tool/merger.rb @@ -131,6 +131,8 @@ else if /--ticket=(.*)/ =~ ARGV[0] tickets = $1.split(/,/).map{|num| " [Backport ##{num}]"} ARGV.shift + else + tickets = [] end q = $repos + (ARGV[1] || default_merge_branch) |