Fix swallowing original error message in git_retry (#573)

crystal-lang · Mar 14, 2023 · e56c44a · e56c44a
1 parent aa5fa55
commit e56c44a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/spec/integration/install_spec.cr b/spec/integration/install_spec.cr
@@ -1266,4 +1266,12 @@ describe "install" do
       end
     end
   end
+
+  it "fails when git is missing" do
+    metadata = {dependencies: {web: "*"}}
+    with_shard(metadata) do
+      ex = expect_raises(FailedCommand) { run "shards install --no-color", env: {"PATH" => File.expand_path("../../bin", __DIR__), "SHARDS_CACHE_PATH" => ""} }
+      ex.stdout.should contain "Error missing git command line tool. Please install Git first!"
+    end
+  end
 end
diff --git a/src/resolvers/git.cr b/src/resolvers/git.cr
@@ -332,10 +332,11 @@ module Shards
       loop do
         yield
         break
-      rescue Error
+      rescue inner_err : Error
         retries += 1
         next if retries < 3
-        raise Error.new(err)
+        Log.debug { inner_err }
+        raise Error.new("#{err}: #{inner_err}")
       end
     end