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

ruby-changes:57245

From: Kazuhiro <ko1@a...>
Date: Sun, 25 Aug 2019 13:59:27 +0900 (JST)
Subject: [ruby-changes:57245] Kazuhiro NISHIYAMA: 1b03d2d76b (master): Revert workaround

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

From 1b03d2d76be48039e8a4d609f36d221077a1daa9 Mon Sep 17 00:00:00 2001
From: Kazuhiro NISHIYAMA <zn@m...>
Date: Sun, 25 Aug 2019 13:58:30 +0900
Subject: Revert workaround


diff --git a/tool/lib/vcs.rb b/tool/lib/vcs.rb
index dc7a86a..4684b57 100644
--- a/tool/lib/vcs.rb
+++ b/tool/lib/vcs.rb
@@ -540,17 +540,7 @@ class VCS https://github.com/ruby/ruby/blob/trunk/tool/lib/vcs.rb#L540
     end
 
     def export(revision, url, dir, keep_temp = false)
-      ret = system(COMMAND, "clone", "-s", (@srcdir || '.').to_s, "-b", url, dir)
-      ret
-    rescue => e
-      if "master" == url.to_str && e.message == "Command failed with exit 128: git"
-        warn "retry trunk instead of master", uplevel: 0
-        STDERR.puts "existing branches:"
-        system(COMMAND, "branch", "-a", 1 => 2)
-        url.to_str.replace("trunk")
-        retry
-      end
-      raise
+      system(COMMAND, "clone", "-s", (@srcdir || '.').to_s, "-b", url, dir)
     end
 
     def after_export(dir)
-- 
cgit v0.10.2


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

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