diff options
| author | Jacob Vosmaer <jacob@gitlab.com> | 2018-01-23 18:42:10 +0100 |
|---|---|---|
| committer | Jacob Vosmaer <jacob@gitlab.com> | 2018-01-25 14:05:11 +0100 |
| commit | 6d6f7536bd9b5bcbf94dfbe15cc86e84d06527f5 (patch) | |
| tree | 6b6c62e084b1ce914da742be847d56086b0b6475 /lib/gitlab/git | |
| parent | 1f5af51b476a36a72759e7560c125c2b9602b145 (diff) | |
| download | gitlab-ce-6d6f7536bd9b5bcbf94dfbe15cc86e84d06527f5.tar.gz | |
Look for rugged with static analysislint-rugged
Diffstat (limited to 'lib/gitlab/git')
| -rw-r--r-- | lib/gitlab/git/repository.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb index d6c0980255f..ab37a9235b5 100644 --- a/lib/gitlab/git/repository.rb +++ b/lib/gitlab/git/repository.rb @@ -563,6 +563,8 @@ module Gitlab return false if ancestor_id.nil? || descendant_id.nil? merge_base_commit(ancestor_id, descendant_id) == ancestor_id + rescue Rugged::OdbError + false end # Returns true is +from+ is direct ancestor to +to+, otherwise false |