tool/merger.rb: Support the new format in remove_tag

1 files changed, 5 insertions, 3 deletions

diff --git a/tool/merger.rb b/tool/merger.rb
index a205fd9683..4c096087fc 100755
--- a/tool/merger.rb
+++ b/tool/merger.rb
@@ -142,10 +142,12 @@ class << Merger = Object.new
     unless relname
       raise ArgumentError, 'relname is not specified'
     end
-    if /^v/ !~ relname
-      tagname = "v#{relname.gsub(/[.-]/, '_')}"
-    else
+    if relname.start_with?('v')
       tagname = relname
+    elsif Integer(relname.split('.', 2).first) >= 4
+      tagname = "v#{relname}"
+    else
+      tagname = "v#{relname.gsub(/[.-]/, '_')}"
     end
 
     execute('git', 'tag', '-d', tagname)