Commit 6ea87c47 authored by Cedric Gatay's avatar Cedric Gatay

Incorrect line numbering in diff

When displaying a diff, the line number always starts at one, even if the first diff is not at the first line
Fixes this to display correct line numbering on first diff
parent 8c40aab1
...@@ -61,12 +61,12 @@ module CommitsHelper ...@@ -61,12 +61,12 @@ module CommitsHelper
full_line = html_escape(line.gsub(/\n/, '')).force_encoding("UTF-8") full_line = html_escape(line.gsub(/\n/, '')).force_encoding("UTF-8")
if line.match(/^@@ -/) if line.match(/^@@ -/)
next if line_old == 1 && line_new == 1
type = "match" type = "match"
line_old = line.match(/\-[0-9]*/)[0].to_i.abs rescue 0 line_old = line.match(/\-[0-9]*/)[0].to_i.abs rescue 0
line_new = line.match(/\+[0-9]*/)[0].to_i.abs rescue 0 line_new = line.match(/\+[0-9]*/)[0].to_i.abs rescue 0
next if line_old == 1 && line_new == 1
yield(line, type, nil, nil, nil) yield(line, type, nil, nil, nil)
next next
else else
......
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