From 1b03d2d76be48039e8a4d609f36d221077a1daa9 Mon Sep 17 00:00:00 2001 From: Kazuhiro NISHIYAMA Date: Sun, 25 Aug 2019 13:58:30 +0900 Subject: Revert workaround --- tool/lib/vcs.rb | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'tool/lib') diff --git a/tool/lib/vcs.rb b/tool/lib/vcs.rb index dc7a86a58a..4684b57b28 100644 --- a/tool/lib/vcs.rb +++ b/tool/lib/vcs.rb @@ -540,17 +540,7 @@ class VCS 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 v1.2.3