feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

PatchTool: Preserve CRLF when reverting a chunk

Browse Source 
Fixes: QTCREATORBUG-12690
Change-Id: Ib408a33bd1bd69ebc27a029025313eaf7bdf4f18
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
This commit is contained in:
Orgad Shaneh
2022-11-28 17:51:15 +02:00
committed by Orgad Shaneh
parent 48990c9400
commit a3d1ef4e89
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/coreplugin/patchtool.cpp
View File

@@ -83,7 +83,6 @@ static bool runPatchHelper(const QByteArray &input, const FilePath &workingDirec
args << ("-p" + QString::number(strip)); args << ("-p" + QString::number(strip));
if (patchAction == PatchAction::Revert) if (patchAction == PatchAction::Revert)
args << "-R"; args << "-R";
if (withCrlf)
args << "--binary"; args << "--binary";
MessageManager::writeDisrupting(Tr::tr("Running in %1: %2 %3") MessageManager::writeDisrupting(Tr::tr("Running in %1: %2 %3")
.arg(workingDirectory.toUserOutput(), patch.toUserOutput(), args.join(' '))); .arg(workingDirectory.toUserOutput(), patch.toUserOutput(), args.join(' ')));