summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOrgad Shaneh <orgad.shaneh@audiocodes.com>2013-06-17 07:35:17 +0300
committerOrgad Shaneh <orgads@gmail.com>2013-06-17 11:20:43 +0200
commit1686e314bdf5d9583429d5a965bdc7c6373df3a2 (patch)
tree71f4f101eaf3dac4942ad0e7d1576904f0c3d80a
parent228851d822dcec98ef5b2894a7da3829c4f92703 (diff)
downloadqt-creator-1686e314bdf5d9583429d5a965bdc7c6373df3a2.tar.gz
Git: Use log instead of show to display commit without diff
Change-Id: I12ff53e3375470704fb6aafa6ec0a3eaadd9aadb Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
-rw-r--r--src/plugins/git/branchmodel.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/plugins/git/branchmodel.cpp b/src/plugins/git/branchmodel.cpp
index 324ba17434..1bcc8ac31b 100644
--- a/src/plugins/git/branchmodel.cpp
+++ b/src/plugins/git/branchmodel.cpp
@@ -621,12 +621,10 @@ QString BranchModel::toolTip(const QString &sha) const
// Show the sha description excluding diff as toolTip
QString output;
QString errorMessage;
- if (!m_client->synchronousShow(m_workingDirectory, sha, &output, &errorMessage))
+ QStringList arguments(QLatin1String("-n1"));
+ arguments << sha;
+ if (!m_client->synchronousLog(m_workingDirectory, arguments, &output, &errorMessage))
return errorMessage;
- // Remove 'diff' output
- const int diffPos = output.indexOf(QLatin1String("\ndiff --"));
- if (diffPos != -1)
- output.remove(diffPos, output.size() - diffPos);
return output;
}