Merge remote-tracking branch 'origin/3.0'

2013-11-22 09:11:51 +01:00
parent 759fd36a1e cf3a9b0192
commit 559e66cb35
105 changed files with 2534 additions and 463 deletions
--- a/src/plugins/git/gitclient.cpp
+++ b/src/plugins/git/gitclient.cpp
@@ -1443,7 +1443,7 @@ void GitClient::show(const QString &source, const QString &id,

        GitDiffHandler *handler = new GitDiffHandler(diffEditor,
                                                     gitBinaryPath(),
-                                                     workingDirectory,
+                                                     findRepositoryForDirectory(workingDirectory),
                                                     processEnvironment(),
                                                     settings()->intValue(GitSettings::timeoutKey));
        handler->show(id);