feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

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

Browse Source 
Change-Id: Iceb9a536f6dc53bd9a61cbf5b6bab14154196628
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2013-08-19 05:59:00 +03:00
committed by Orgad Shaneh
parent e1e1936073
commit d45b6d7871
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/git/gitclient.cpp
View File

@@ -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,
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 {