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

Git: Improve stash

Browse Source 
* Use explicit "save" sub-command
* Show output in log window

Change-Id: Icd4a47de2e4548322d1ea06f126d0bd6023e67ee
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
Orgad Shaneh
2015-02-04 22:34:53 +02:00
committed by Orgad Shaneh
parent 2a677ce8b3
commit c9df079885
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1775,16 +1775,17 @@ bool GitClient::executeSynchronousStash(const QString &workingDirectory,
const QString &message, const QString &message,
QString *errorMessage) const QString *errorMessage) const
{ {
QByteArray outputText;
QByteArray errorText;
QStringList arguments; QStringList arguments;
arguments << QLatin1String("stash"); arguments << QLatin1String("stash") << QLatin1String("save");
if (!message.isEmpty()) if (!message.isEmpty())
arguments << QLatin1String("save") << message; arguments << message;
const bool rc = fullySynchronousGit(workingDirectory, arguments, &outputText, &errorText, const unsigned flags = VcsBasePlugin::ShowStdOutInLogWindow
VcsBasePlugin::ExpectRepoChanges); | VcsBasePlugin::ExpectRepoChanges
| VcsBasePlugin::ShowSuccessMessage;
const SynchronousProcessResponse response = synchronousGit(workingDirectory, arguments, flags);
const bool rc = response.result == SynchronousProcessResponse::Finished;
if (!rc) if (!rc)
msgCannotRun(arguments, workingDirectory, errorText, errorMessage); msgCannotRun(arguments, workingDirectory, response.stdErr.toLocal8Bit(), errorMessage);
return rc; return rc;
} }