diff --git a/src/GitList/Git/Repository.php b/src/GitList/Git/Repository.php index ab5b567..d04f987 100644 --- a/src/GitList/Git/Repository.php +++ b/src/GitList/Git/Repository.php @@ -169,9 +169,9 @@ class Repository extends BaseRepository switch ($log[0]) { case "@": // Set the line numbers - preg_match('/@@ -([0-9]+)/', $log, $matches); + preg_match('/@@ -([0-9]+)(?:,[0-9]+)? \+([0-9]+)/', $log, $matches); $lineNumOld = $matches[1] - 1; - $lineNumNew = $matches[1] - 1; + $lineNumNew = $matches[2] - 1; break; case "-": $lineNumOld++; diff --git a/themes/bootstrap3/twig/commit.twig b/themes/bootstrap3/twig/commit.twig index e0732f6..9c64c3b 100644 --- a/themes/bootstrap3/twig/commit.twig +++ b/themes/bootstrap3/twig/commit.twig @@ -52,7 +52,7 @@