diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2017-11-26 10:24:32 +0200 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2017-11-27 11:40:31 +0000 |
| commit | 63861c44c1e4f9d4cf6a7a48fe9534b4f73d0ad7 (patch) | |
| tree | ffec6214cebb2bb8d15632fc03420bbb62d7052f /src/plugins/diffeditor/diffutils.h | |
| parent | 8bc3ac9177e6f8f05c2c64a400d244a5cc82aa0a (diff) | |
| download | qt-creator-63861c44c1e4f9d4cf6a7a48fe9534b4f73d0ad7.tar.gz | |
DiffEditor: Fix parsing of mode-only change in patch
If one of the files has mode-only change, the entire patch
fails as a git patch, and is parsed as a text patch.
Because of that, the prefixes (a/, b/) are not stripped and
jumping to a change by double-clicking does not work.
Change-Id: Ib54ce4fa7aad02cb956af1f7de73d3c732ac5a89
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Diffstat (limited to 'src/plugins/diffeditor/diffutils.h')
| -rw-r--r-- | src/plugins/diffeditor/diffutils.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/diffeditor/diffutils.h b/src/plugins/diffeditor/diffutils.h index 46a8bb40b0..ed0130bfbd 100644 --- a/src/plugins/diffeditor/diffutils.h +++ b/src/plugins/diffeditor/diffutils.h @@ -104,6 +104,7 @@ class DIFFEDITOR_EXPORT FileData { public: enum FileOperation { ChangeFile, + ChangeMode, NewFile, DeleteFile, CopyFile, |