[前][次][番号順一覧][スレッド一覧]

ruby-changes:57358

From: nagachika <ko1@a...>
Date: Wed, 28 Aug 2019 14:50:48 +0900 (JST)
Subject: [ruby-changes:57358] nagachika: ed8d2e1cfd (master): tool/merger.rb: fix tag existence check with subversion.

https://git.ruby-lang.org/ruby.git/commit/?id=ed8d2e1cfd

From ed8d2e1cfdc57bba03065e96424e4ba7df45682e Mon Sep 17 00:00:00 2001
From: nagachika <nagachika@r...>
Date: Wed, 28 Aug 2019 14:50:21 +0900
Subject: tool/merger.rb: fix tag existence check with subversion.


diff --git a/tool/merger.rb b/tool/merger.rb
index 228faef..c59f9ac 100755
--- a/tool/merger.rb
+++ b/tool/merger.rb
@@ -18,6 +18,8 @@ module Merger https://github.com/ruby/ruby/blob/trunk/tool/merger.rb#L18
 end
 
 class << Merger
+  include Merger
+
   def help
     puts <<-HELP
 \e[1msimple backport\e[0m
@@ -139,7 +141,8 @@ class << Merger https://github.com/ruby/ruby/blob/trunk/tool/merger.rb#L141
         end
       end
       tag_url = "#{REPOS}tags/#{tagname}"
-      unless system('svn', 'info', tag_url, out: IO::NULL, err: IO::NULL)
+      system('svn', 'info', tag_url, out: IO::NULL, err: IO::NULL)
+      if $?.success?
         abort 'specfied tag already exists. check tag name and remove it if you want to force re-tagging'
       end
       execute('svn', 'cp', '-m', "add tag #{tagname}", branch_url, tag_url, interactive: true)
-- 
cgit v0.10.2


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]