summaryrefslogtreecommitdiff
path: root/tool/merger.rb
diff options
context:
space:
mode:
Diffstat (limited to 'tool/merger.rb')
-rwxr-xr-xtool/merger.rb2
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)