diff options
| -rw-r--r-- | app/models/repository.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/models/repository.rb b/app/models/repository.rb index 7f0047a002e..5d12986812a 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -611,6 +611,8 @@ class Repository end def merge_base(first_commit_id, second_commit_id) + first_commit_id = commit(first_commit_id).id + second_commit_id = commit(second_commit_id).id rugged.merge_base(first_commit_id, second_commit_id) rescue Rugged::ReferenceError nil |