Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Utilities
Kate
Commits
7f769010
Commit
7f769010
authored
Oct 12, 2021
by
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
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
addons/git-blame/kategitblameplugin.cpp
View file @
7f769010
...
...
@@ -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
});
}
}
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment