summaryrefslogtreecommitdiff
path: root/src/plugins/git/gitplugin.cpp
diff options
context:
space:
mode:
authorOrgad Shaneh <orgad.shaneh@audiocodes.com>2013-08-06 15:14:54 +0300
committerOrgad Shaneh <orgads@gmail.com>2013-08-07 17:43:58 +0200
commit35798d4ad6603c6bcbff1bbafdb07d10cfab96a9 (patch)
tree6351cde2be461e9392209241799560e2afcafec0 /src/plugins/git/gitplugin.cpp
parent92afe048ef19b77e35d2ea240d292b6d08bdf43b (diff)
downloadqt-creator-35798d4ad6603c6bcbff1bbafdb07d10cfab96a9.tar.gz
VCS: Use a single filename for log
The list always contains a single entry (or none) anyway Take 2. This time it actually compiles ;-) Change-Id: I71a9822360a9b569ba79afa0f575e27918bb2e03 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Diffstat (limited to 'src/plugins/git/gitplugin.cpp')
-rw-r--r--src/plugins/git/gitplugin.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp
index 6801a97390..2df9f0b087 100644
--- a/src/plugins/git/gitplugin.cpp
+++ b/src/plugins/git/gitplugin.cpp
@@ -744,7 +744,9 @@ void GitPlugin::diffCurrentProject()
{
const VcsBase::VcsBasePluginState state = currentState();
QTC_ASSERT(state.hasProject(), return);
- m_gitClient->diff(state.currentProjectTopLevel(), state.relativeCurrentProject());
+ const QString relativeProject = state.relativeCurrentProject();
+ m_gitClient->diff(state.currentProjectTopLevel(),
+ relativeProject.isEmpty() ? QStringList() : QStringList(relativeProject));
}
void GitPlugin::diffRepository()
@@ -758,7 +760,7 @@ void GitPlugin::logFile()
{
const VcsBase::VcsBasePluginState state = currentState();
QTC_ASSERT(state.hasFile(), return);
- m_gitClient->log(state.currentFileTopLevel(), QStringList(state.relativeCurrentFile()), true);
+ m_gitClient->log(state.currentFileTopLevel(), state.relativeCurrentFile(), true);
}
void GitPlugin::blameFile()