Skip to content

Fix avoid swallowing error message if git command failed #569

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 19, 2023
Merged

Fix avoid swallowing error message if git command failed #569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
af76f03
Fix avoid swallowing error message if git command failed
straight-shoota Jan 7, 2023
92cecd6
Adjust error behaviour for hg resolver to follow git
straight-shoota Jan 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/resolvers/git.cr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,8 +433,10 @@ module Shards
str = error.to_s
if str.starts_with?("error: ") && (idx = str.index('\n'))
message = str[7...idx]
raise Error.new("Failed #{command} (#{message}). Maybe a commit, branch or file doesn't exist?")
else
raise Error.new("Failed #{command}.\n#{str}")
end
raise Error.new("Failed #{command} (#{message}). Maybe a commit, branch or file doesn't exist?")
end
end

Expand Down
4 changes: 2 additions & 2 deletions src/resolvers/hg.cr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,10 +457,10 @@ module Shards
str = error.to_s
if str.starts_with?("abort: ") && (idx = str.index('\n'))
message = str[7...idx]
raise Error.new("Failed #{command} (#{message}). Maybe a commit, branch, bookmark or file doesn't exist?")
else
message = str
raise Error.new("Failed #{command}.\n#{str}")
end
raise Error.new("Failed #{command} (#{message}). Maybe a commit, branch, bookmark or file doesn't exist?")
end
end

Expand Down