From 727c8cdfe7d5769d403f180b539e08e0f03eae2f Mon Sep 17 00:00:00 2001
From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 12 Oct 2012 07:07:10 +0000
Subject: * 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
---
 ChangeLog      | 4 ++++
 tool/merger.rb | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 459daef951..c71590bf27 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Oct 12 16:06:20 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* tool/merger.rb: now can merge revision(s) without --ticket again.
+
 Fri Oct 12 14:10:41 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/mkmf.rb (dir_config, init_mkmf): use configured libdir value as
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)
-- 
cgit v1.2.3