diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2022-11-28 17:51:15 +0200 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2023-01-04 09:19:21 +0000 |
| commit | a3d1ef4e89d86b82a523b8cbe71ed13e71bcbe15 (patch) | |
| tree | fca84cee88c0fe83b3c7369eda9d23d60b91778a /src/plugins/coreplugin/patchtool.cpp | |
| parent | 48990c940062803aa4569f9462382b83a1537b73 (diff) | |
| download | qt-creator-a3d1ef4e89d86b82a523b8cbe71ed13e71bcbe15.tar.gz | |
PatchTool: Preserve CRLF when reverting a chunk
Fixes: QTCREATORBUG-12690
Change-Id: Ib408a33bd1bd69ebc27a029025313eaf7bdf4f18
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Diffstat (limited to 'src/plugins/coreplugin/patchtool.cpp')
| -rw-r--r-- | src/plugins/coreplugin/patchtool.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/plugins/coreplugin/patchtool.cpp b/src/plugins/coreplugin/patchtool.cpp index f866647f9c..011f89233c 100644 --- a/src/plugins/coreplugin/patchtool.cpp +++ b/src/plugins/coreplugin/patchtool.cpp @@ -83,8 +83,7 @@ static bool runPatchHelper(const QByteArray &input, const FilePath &workingDirec args << ("-p" + QString::number(strip)); if (patchAction == PatchAction::Revert) args << "-R"; - if (withCrlf) - args << "--binary"; + args << "--binary"; MessageManager::writeDisrupting(Tr::tr("Running in %1: %2 %3") .arg(workingDirectory.toUserOutput(), patch.toUserOutput(), args.join(' '))); patchProcess.setCommand({patch, args}); |