Skip to content

Fix missing lines in Parallel Diff

Created by: GeorgeDewar

A user of Gitlab here has noticed that the Parallel Diff feature chops a bunch of lines off the end of a file. This issue predates the recent changes to this feature - it affects the current version of Gitlab and can be observed on demo.gitlab.com.

We have deduced that what is happening is that a line count that removes empty lines is being used, and so for every empty (or whitespace, I imagine) line in the file, a line off the end is not shown.

This PR seems to resolve the problem by using the loc method instead of the sloc method. It also correctly calculates the maximum length of the two files, avoiding another issue where unnecessary lines are appended to the end of the diff output if the lengths of the files differ.

Merge request reports