summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorOrgad Shaneh <orgad.shaneh@audiocodes.com>2013-04-28 21:05:02 +0300
committerTobias Hunger <tobias.hunger@digia.com>2013-04-29 11:13:42 +0200
commit86c2342ed2ca9f2ae95f81e9f594328a8d0bf499 (patch)
tree14f0116437d6f31994613bda9812635624595edd /src
parent4d18710f464c4a2d1171ec02c1aa3d6298d39cf6 (diff)
downloadqt-creator-86c2342ed2ca9f2ae95f81e9f594328a8d0bf499.tar.gz
Git: Fix Precedes/Follows display for show opened from log
Change-Id: Ib999f8f00b065e4e51b70f1c5f81bdd17baabd8c Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Diffstat (limited to 'src')
-rw-r--r--src/plugins/git/giteditor.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/git/giteditor.cpp b/src/plugins/git/giteditor.cpp
index fe2871ad89..23eb2ba73c 100644
--- a/src/plugins/git/giteditor.cpp
+++ b/src/plugins/git/giteditor.cpp
@@ -192,7 +192,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;