diff options
author | Sean McGivern <sean@gitlab.com> | 2018-07-10 17:00:13 +0300 |
---|---|---|
committer | Sean McGivern <sean@gitlab.com> | 2018-07-10 17:06:20 +0300 |
commit | 57fc7cd8f35525f772d7c59a2aa45c96467cb882 (patch) | |
tree | 12123ad5d95b5bd5b3335996cbe398f27d9780c1 /lib/gitlab/gitaly_client | |
parent | 3d4873fa64c833c71ab7ee274002d854eb93ef96 (diff) |
Make sure ConflictsService does not raise for conflicting submodules
Diffstat (limited to 'lib/gitlab/gitaly_client')
-rw-r--r-- | lib/gitlab/gitaly_client/conflicts_service.rb | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/gitlab/gitaly_client/conflicts_service.rb b/lib/gitlab/gitaly_client/conflicts_service.rb index b1a01b185e6..aa7e03301f5 100644 --- a/lib/gitlab/gitaly_client/conflicts_service.rb +++ b/lib/gitlab/gitaly_client/conflicts_service.rb @@ -25,10 +25,12 @@ module Gitlab def conflicts? list_conflict_files.any? - rescue GRPC::FailedPrecondition - # The server raises this exception when it encounters ConflictSideMissing, which - # means a conflict exists but its `theirs` or `ours` data is nil due to a non-existent - # file in one of the trees. + rescue GRPC::FailedPrecondition, GRPC::Unknown + # The server raises FailedPrecondition when it encounters + # ConflictSideMissing, which means a conflict exists but its `theirs` or + # `ours` data is nil due to a non-existent file in one of the trees. + # + # GRPC::Unknown comes from Rugged::ReferenceError and Rugged::OdbError. true end |