Commit e9e01bcd authored by Mark Riedesel's avatar Mark Riedesel Committed by Rémy Coutable

Fix 500 error when comparing by tags

parent 9b1dfd3e
......@@ -611,6 +611,8 @@ class Repository
end
def merge_base(first_commit_id, second_commit_id)
first_commit_id = commit(first_commit_id).try(:id) || first_commit_id
second_commit_id = commit(second_commit_id).try(:id) || second_commit_id
rugged.merge_base(first_commit_id, second_commit_id)
rescue Rugged::ReferenceError
nil
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment