diff options
| author | Jacob Vosmaer (GitLab) <jacob@gitlab.com> | 2018-07-16 15:30:52 +0300 |
|---|---|---|
| committer | Jacob Vosmaer (GitLab) <jacob@gitlab.com> | 2018-07-16 15:30:52 +0300 |
| commit | b34c8deea812c485c4bf3bc1bf556f3567c01d14 (patch) | |
| tree | 00b2f5a051fadaf08c81bbd04e06bc77b762ec01 | |
| parent | 39d80fd31bfd50a01cefba329d7ddf06432d9aa3 (diff) | |
| parent | bc52cc2fefd0cd1fd4a74ad052ac25572658efae (diff) | |
Merge branch 'list-error-message' into 'master'
Improve ListError message
See merge request gitlab-org/gitaly!809
| -rw-r--r-- | changelogs/unreleased/list-error-message.yml | 5 | ||||
| -rw-r--r-- | ruby/lib/gitlab/git/conflict/resolver.rb | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/changelogs/unreleased/list-error-message.yml b/changelogs/unreleased/list-error-message.yml new file mode 100644 index 000000000..4a62480d4 --- /dev/null +++ b/changelogs/unreleased/list-error-message.yml @@ -0,0 +1,5 @@ +--- +title: Improve ListError message +merge_request: 809 +author: +type: other diff --git a/ruby/lib/gitlab/git/conflict/resolver.rb b/ruby/lib/gitlab/git/conflict/resolver.rb index 2469b2073..86a16f0f2 100644 --- a/ruby/lib/gitlab/git/conflict/resolver.rb +++ b/ruby/lib/gitlab/git/conflict/resolver.rb @@ -14,7 +14,7 @@ module Gitlab def conflicts @conflicts = rugged_list_conflict_files rescue Rugged::ReferenceError, Rugged::OdbError => e - raise ListError.new(e) + raise ListError, e end def resolve_conflicts(source_repository, resolution, source_branch:, target_branch:) @@ -31,7 +31,9 @@ module Gitlab def conflict_files(repository, index) index.conflicts.map do |conflict| - raise ListError unless conflict[:theirs] && conflict[:ours] + unless conflict[:theirs] && conflict[:ours] + raise ListError, 'conflict side missing' + end Gitlab::Git::Conflict::File.new( repository, |