Refine exception messages when git failed

1 files changed, 7 insertions, 4 deletions

diff --git a/tool/lib/bundled_gem.rb b/tool/lib/bundled_gem.rb
index 7fdaaf816f..a92c56d7e0 100644
--- a/tool/lib/bundled_gem.rb
+++ b/tool/lib/bundled_gem.rb
@@ -87,13 +87,16 @@ module BundledGem
   end
 
   def checkout(gemdir, repo, rev, git: $git)
-    return unless rev
+    return unless rev or !git or git.empty?
     unless File.exist?("#{gemdir}/.git")
       puts "Cloning #{repo}"
-      system("#{git} clone #{repo} #{gemdir}") or raise
+      command = "#{git} clone #{repo} #{gemdir}"
+      system(command) or raise "failed: #{command}"
     end
     puts "Update #{File.basename(gemdir)} to #{rev}"
-    system("#{git} fetch origin #{rev}", chdir: gemdir)
-    system("#{git} checkout --detach #{rev}", chdir: gemdir)
+    command = "#{git} fetch origin #{rev}"
+    system(command, chdir: gemdir) or raise "failed: #{command}"
+    command = "#{git} checkout --detach #{rev}"
+    system(command, chdir: gemdir) or raise "failed: #{command}"
   end
 end