Commit df6bb579 authored by Robert Speicher's avatar Robert Speicher
Browse files

Merge branch 'compare-first-commit' into 'master'

Correctly set comparison first commit when range includes a merge commit

Fixes #3207.

See merge request !1814
......@@ -20,8 +20,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
......
......@@ -161,7 +161,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