forked from qt-creator/qt-creator
Git: Use stash pop instead of apply...
... when the stash should be removed on successful pop Change-Id: I39b2c01b0a518d3c70bcb8dc898191cca6d3e84d Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
committed by
Orgad Shaneh
parent
53443616e5
commit
daef1fbb88
@@ -2282,12 +2282,13 @@ void GitClient::stashPop(const QString &workingDirectory)
|
||||
|
||||
bool GitClient::synchronousStashRestore(const QString &workingDirectory,
|
||||
const QString &stash,
|
||||
bool pop,
|
||||
const QString &branch /* = QString()*/,
|
||||
QString *errorMessage)
|
||||
{
|
||||
QStringList arguments(QLatin1String("stash"));
|
||||
if (branch.isEmpty())
|
||||
arguments << QLatin1String("apply") << stash;
|
||||
arguments << QLatin1String(pop ? "pop" : "apply") << stash;
|
||||
else
|
||||
arguments << QLatin1String("branch") << branch << stash;
|
||||
QByteArray outputText;
|
||||
|
||||
Reference in New Issue
Block a user