From b8036e7d319111f5d9265440e024e4f1e6e96e4a Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Thu, 24 Nov 2016 11:10:00 +0100 Subject: [PATCH] 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 --- src/plugins/diffeditor/diffutils.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/plugins/diffeditor/diffutils.cpp b/src/plugins/diffeditor/diffutils.cpp index ee3ea2f3ea5..2c906fd5752 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;