From 398872bcdc009724690f7ead12dc73a6b714aeac Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Sun, 29 Jun 2014 17:35:41 +0300 Subject: [PATCH] Git: Fix showing commits from rebase-todo editor We used to need the repository root in order to resolve the file. This is no longer needed, since the raw patch is parsed instead. Change-Id: Ifdbbcd686a5ef7bbbd472f37b20190b9e9abebe7 Reviewed-by: Tobias Hunger --- src/plugins/git/gitclient.cpp | 5 +---- src/plugins/vcsbase/vcsbaseplugin.cpp | 1 + 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index 43601b187ce..699e1325b8d 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -369,11 +369,8 @@ GitDiffEditorReloader::GitDiffEditorReloader(QObject *parent) void GitDiffEditorReloader::reload() { - const QString workingDirectory = m_diffType == DiffShow - ? m_gitClient->findRepositoryForDirectory(m_workingDirectory) - : m_workingDirectory; GitDiffHandler *handler = new GitDiffHandler(diffEditorController(), - workingDirectory); + m_workingDirectory); connect(handler, SIGNAL(destroyed()), this, SLOT(reloadFinished())); switch (m_diffType) { diff --git a/src/plugins/vcsbase/vcsbaseplugin.cpp b/src/plugins/vcsbase/vcsbaseplugin.cpp index ff6758d9e2c..5a4c16ba4c5 100644 --- a/src/plugins/vcsbase/vcsbaseplugin.cpp +++ b/src/plugins/vcsbase/vcsbaseplugin.cpp @@ -750,6 +750,7 @@ static const char SOURCE_PROPERTY[] = "qtcreator_source"; void VcsBasePlugin::setSource(Core::IDocument *document, const QString &source) { document->setProperty(SOURCE_PROPERTY, source); + VcsBasePluginPrivate::m_listener->slotStateChanged(); } QString VcsBasePlugin::source(Core::IDocument *document)