diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2013-04-30 11:43:33 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2013-04-30 11:43:33 +0200 |
| commit | bedc477943ba94c38db133b8cf6d20132d56a315 (patch) | |
| tree | ae64d44a5d12f66e07a0c2d963d885bcf0ceb5db /src/plugins/git | |
| parent | 3aa0e500392192dc6306a29d4a60b4d362a29811 (diff) | |
| parent | 71f1919de9a1ce0abc370fb2a1044ad6e85438cf (diff) | |
| download | qt-creator-bedc477943ba94c38db133b8cf6d20132d56a315.tar.gz | |
Merge remote-tracking branch 'origin/2.7'
Conflicts:
src/plugins/qmldesigner/components/formeditor/abstractcustomtool.cpp
Change-Id: I4e0a85795e7f4bfcdc21d106517517b527f85104
Diffstat (limited to 'src/plugins/git')
| -rw-r--r-- | src/plugins/git/giteditor.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/git/giteditor.cpp b/src/plugins/git/giteditor.cpp index 1faa6b58ba..1b4d3e3fd6 100644 --- a/src/plugins/git/giteditor.cpp +++ b/src/plugins/git/giteditor.cpp @@ -180,7 +180,7 @@ void GitEditor::setPlainTextDataFiltered(const QByteArray &a) } case VcsBase::DiffOutput: { const QFileInfo fi(source()); - const QString workingDirectory = fi.absolutePath(); + const QString workingDirectory = fi.isDir() ? fi.absoluteFilePath() : fi.absolutePath(); QByteArray precedes, follows; if (array.startsWith("commit ")) { // show int lastHeaderLine = array.indexOf("\n\n") + 1; |