diff options
author | Kazuhiro NISHIYAMA <zn@mbf.nifty.com> | 2019-08-25 13:58:30 +0900 |
---|---|---|
committer | Kazuhiro NISHIYAMA <zn@mbf.nifty.com> | 2019-08-25 13:58:30 +0900 |
commit | 1b03d2d76be48039e8a4d609f36d221077a1daa9 (patch) | |
tree | 51cbe68f95e5c72950df7440788072b0a40251e9 /tool | |
parent | 5decf66ab3395193160673ddd80395a5b3b86223 (diff) |
Revert workaround
Diffstat (limited to 'tool')
-rw-r--r-- | tool/lib/vcs.rb | 12 |
1 files changed, 1 insertions, 11 deletions
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) |