Commit 24cf6865 authored by Douwe Maan's avatar Douwe Maan
Browse files

Correctly set comparison first commit when range includes a merge commit

parent c1fdef594487
......@@ -19,8 +19,8 @@ def show
if compare_result
@commits = Commit.decorate(compare_result.commits, @project)
@diffs = compare_result.diffs
@commit = @commits.last
@first_commit = @commits.first
@commit = @project.commit(head_ref)
@first_commit = @project.commit(base_ref)
@line_notes = []
end
end
......
......@@ -171,7 +171,7 @@ def submodule_link(blob, ref, repository = @repository)
def commit_for_diff(diff)
if diff.deleted_file
first_commit = @first_commit || @commit
first_commit.parent
first_commit.parent || @first_commit
else
@commit
end
......
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