Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion app/jobs/update_tracks_build_status_job.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ def perform
tracks.find_each do |track|
Track::UpdateBuildStatus.(track)
rescue StandardError => e
Sentry.capture_exception(e)
Sentry.capture_exception(e, extra: { track_slug: track.slug, synced_to_git_sha: track.synced_to_git_sha })
end
end

Expand Down
4 changes: 3 additions & 1 deletion app/models/git/repository.rb
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,13 @@ def read_blob(oid, default = nil)
def lookup_commit(sha, update_on_failure: true)
return head_commit if sha == "HEAD"

raise MissingCommitError, sha if sha.blank?

lookup(sha).tap do |object|
raise 'wrong-type' if object.type != :commit
end
rescue Rugged::OdbError, Rugged::InvalidError
raise MissingCommitError unless update_on_failure
raise MissingCommitError, sha unless update_on_failure

fetch!
lookup_commit(sha, update_on_failure: false)
Expand Down
16 changes: 16 additions & 0 deletions test/models/git/repository_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,22 @@ class RepositoryTest < ActiveSupport::TestCase
end
end

test "lookup_commit_for_blank_sha_raises_without_fetch" do
repository = ::Git::Repository.new(repo_url: TestHelpers.git_repo_url("track"))
repository.expects(:fetch!).never
assert_raises Git::MissingCommitError do
repository.lookup_commit("")
end
end

test "lookup_commit_for_nil_sha_raises_without_fetch" do
repository = ::Git::Repository.new(repo_url: TestHelpers.git_repo_url("track"))
repository.expects(:fetch!).never
assert_raises Git::MissingCommitError do
repository.lookup_commit(nil)
end
end

test "lookup_commit_for_head" do
repository = ::Git::Repository.new(repo_url: TestHelpers.git_repo_url("track"))
assert_equal repository.head_commit, repository.lookup_commit("HEAD")
Expand Down
Loading