diff options
| author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2016-11-24 11:10:00 +0100 |
|---|---|---|
| committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2016-11-24 10:33:20 +0000 |
| commit | b8036e7d319111f5d9265440e024e4f1e6e96e4a (patch) | |
| tree | d259ff11d64fc60306e90fed8402cc0e91f0fb14 /src/plugins/diffeditor/diffutils.cpp | |
| parent | f778880a3b5ac5aaae40e77fb2543fb64afea149 (diff) | |
| download | qt-creator-b8036e7d319111f5d9265440e024e4f1e6e96e4a.tar.gz | |
Don't save context chunks
Otherwise the saved patch file contains the whole contents
of the compared files.
Change-Id: I0f2d4c4e9b2c56ceab2b1e312e0895087060d0dc
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/plugins/diffeditor/diffutils.cpp')
| -rw-r--r-- | src/plugins/diffeditor/diffutils.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/diffeditor/diffutils.cpp b/src/plugins/diffeditor/diffutils.cpp index ee3ea2f3ea..2c906fd575 100644 --- a/src/plugins/diffeditor/diffutils.cpp +++ b/src/plugins/diffeditor/diffutils.cpp @@ -353,6 +353,9 @@ QString DiffUtils::makePatchLine(const QChar &startLineCharacter, QString DiffUtils::makePatch(const ChunkData &chunkData, bool lastChunk) { + if (chunkData.contextChunk) + return QString(); + QString diffText; int leftLineCount = 0; int rightLineCount = 0; |