Commit d45b6d78 authored by Orgad Shaneh's avatar Orgad Shaneh Committed by Orgad Shaneh

Git: Fix side-by-side show opened from interactive rebase editor

Change-Id: Iceb9a536f6dc53bd9a61cbf5b6bab14154196628
Reviewed-by: default avatarTobias Hunger <tobias.hunger@digia.com>
parent e1e19360
...@@ -360,7 +360,7 @@ void GitDiffHandler::collectFilesContents() ...@@ -360,7 +360,7 @@ void GitDiffHandler::collectFilesContents()
QString revisionArgument = (revision.type == Other) QString revisionArgument = (revision.type == Other)
? revision.id : QString(); ? revision.id : QString();
revisionArgument += QLatin1String(":./"); revisionArgument += QLatin1Char(':');
QStringList arguments; QStringList arguments;
arguments << QLatin1String("show") << revisionArgument + fileName; arguments << QLatin1String("show") << revisionArgument + fileName;
command->addJob(arguments, m_timeout); command->addJob(arguments, m_timeout);
...@@ -1206,8 +1206,7 @@ void GitClient::show(const QString &source, const QString &id, ...@@ -1206,8 +1206,7 @@ void GitClient::show(const QString &source, const QString &id,
DiffEditor::Constants::DIFF_SHOW_EDITOR_ID); DiffEditor::Constants::DIFF_SHOW_EDITOR_ID);
int timeout = settings()->intValue(GitSettings::timeoutKey); int timeout = settings()->intValue(GitSettings::timeoutKey);
GitDiffHandler *handler = new GitDiffHandler(editor, gitBinaryPath(), GitDiffHandler *handler = new GitDiffHandler(editor, gitBinaryPath(), workDir,
findRepositoryForDirectory(workDir),
processEnvironment(), timeout); processEnvironment(), timeout);
handler->show(id); handler->show(id);
} else { } else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment