PR#3434: Fix splitting the diff per file -

pagure

#3434 Fix splitting the diff per file

Merged Jul 19, 2018 by pingou. Opened Jul 16, 2018 by pingou.

fix_split_diff into master

pingou commented Jul 16, 2018

Basically, when rendering diffs, we split them by file so we can render
the changes made to each file separately.
However, if one of the file happens to contain a diff itself (for example
if that file is a patch), then we don't want to split that, it'll make a
mess.
So rather than splitting on "diff --git a/" we ensure we're spliting on new
lines starting with this by splitting on "\ndiff --git a/".

Fixes https://pagure.io/pagure/issue/3426

Signed-off-by: Pierre-Yves Chibon pingou@pingoured.fr

ngompa commented Jul 16, 2018

@pingou Tests for this functionality need to be fixed.

pingou commented Jul 17, 2018

Indeed, thanks for pointing it out

rebased onto 2596638cadb6da90a50f212bddd4fb666ddf6b9f

Jul 17, 2018

pingou commented Jul 17, 2018

Turns out the issue wasn't in the code but in the logic, so the logic has been adjusted :)

rebased onto ea9ae020abbcb03189c167350d4aff4834c3242b

Jul 18, 2018