Fix 500 error when comparing by tags

This commit is contained in:
Mark Riedesel
2016-02-17 12:56:53 +01:00
committed by Rémy Coutable
parent 9b1dfd3e81
commit e9e01bcd96
+2
View File
@@ -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