From 51a9d5065a9c1243ef942bc71220413eaa4e785b Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Tue, 9 Jul 2013 22:34:44 +0300
Subject: [PATCH] VCS: Support chunks without comma
Git submodule is reported as @@ -1 +1 @@
Change-Id: Ic7a619b0f4c8eb505b75529501dcd18723de2465
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
---
src/plugins/vcsbase/vcsbaseeditor.cpp | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/plugins/vcsbase/vcsbaseeditor.cpp b/src/plugins/vcsbase/vcsbaseeditor.cpp
index 60df5d64955..733982d8533 100644
--- a/src/plugins/vcsbase/vcsbaseeditor.cpp
+++ b/src/plugins/vcsbase/vcsbaseeditor.cpp
@@ -1078,8 +1078,11 @@ static inline bool checkChunkLine(const QString &line, int *modifiedLineNumber,
return false;
const int lineNumberPos = plusPos + 1;
const int commaPos = line.indexOf(QLatin1Char(','), lineNumberPos);
- if (commaPos == -1 || commaPos > endPos)
- return false;
+ if (commaPos == -1 || commaPos > endPos) {
+ // Git submodule appears as "@@ -1 +1 @@"
+ *modifiedLineNumber = 1;
+ return true;
+ }
const QString lineNumberStr = line.mid(lineNumberPos, commaPos - lineNumberPos);
bool ok;
*modifiedLineNumber = lineNumberStr.toInt(&ok);
--
GitLab