Commit 7f769010 authored by Kåre Särs's avatar Kåre Särs
Browse files

Git-blame: Fix for Windows/DOS end of line files

parent 82bb95cb
Pipeline #88107 passed with stage
in 2 minutes and 52 seconds
......@@ -293,8 +293,9 @@ void KateGitBlamePluginView::blameFinished(int /*exitCode*/, QProcess::ExitStatu
for (const auto &line : stdOut) {
const QRegularExpressionMatch match = lineReg.match(line);
if (match.hasMatch()) {
m_blameInfo.append(
{match.captured(1), match.captured(2).trimmed(), QDateTime::fromString(match.captured(3), Qt::ISODate), QString(), match.captured(4)});
QString lineContent = match.captured(4);
lineContent.remove(QLatin1Char('\r'));
m_blameInfo.append({match.captured(1), match.captured(2).trimmed(), QDateTime::fromString(match.captured(3), Qt::ISODate), QString(), lineContent});
}
}
}
......
Supports Markdown
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