diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2017-05-09 15:07:30 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2017-05-09 15:07:30 +0200 |
| commit | 6e8ee7479e7fda2c79c50f1ffea5d7bda36f96d0 (patch) | |
| tree | c62a96b84f7b6af02faa3eca7d603a8aa96944ea /src/plugins/git/gerrit/gerritmodel.cpp | |
| parent | d571e8d442e862f3e89825f5d3eb02fae94dd9ec (diff) | |
| parent | 3282f85f3db743aa96e4d3410e4737284a9b566c (diff) | |
| download | qt-creator-6e8ee7479e7fda2c79c50f1ffea5d7bda36f96d0.tar.gz | |
Merge remote-tracking branch 'origin/4.3'
Conflicts:
src/plugins/debugger/cdb/cdbengine.cpp
Change-Id: Ib9aeccc4162c43e9ee3d85847d96678045625dd0
Diffstat (limited to 'src/plugins/git/gerrit/gerritmodel.cpp')
| -rw-r--r-- | src/plugins/git/gerrit/gerritmodel.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/git/gerrit/gerritmodel.cpp b/src/plugins/git/gerrit/gerritmodel.cpp index 77921e650a..16a303d50a 100644 --- a/src/plugins/git/gerrit/gerritmodel.cpp +++ b/src/plugins/git/gerrit/gerritmodel.cpp @@ -799,7 +799,8 @@ static bool parseOutput(const QSharedPointer<GerritParameters> ¶meters, } else { adaptedOutput = output; // Strip first line, which is )]}' - adaptedOutput.remove(0, adaptedOutput.indexOf("\n")); + if (adaptedOutput.startsWith(')')) + adaptedOutput.remove(0, adaptedOutput.indexOf("\n")); } bool res = true; |