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

Git: Refactor reset

Browse Source 
Remove enum, provide the associated flag in the combobox.

Change-Id: I1c4751c75f59312904fe7c175678f965ac16741d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2013-04-19 09:20:08 +03:00
committed by Orgad Shaneh
parent cbfeb36ce7
commit e6da908321
5 changed files with 11 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -869,10 +869,10 @@ bool GitClient::synchronousCheckout(const QString &workingDirectory,
return true;
}
void GitClient::hardReset(const QString &workingDirectory, const QString &commit)
void GitClient::reset(const QString &workingDirectory, const QString &argument, const QString &commit)
{
QStringList arguments;
arguments << QLatin1String("reset") << QLatin1String("--hard");
arguments << QLatin1String("reset") << argument;
if (!commit.isEmpty())
arguments << commit;
@@ -880,18 +880,6 @@ void GitClient::hardReset(const QString &workingDirectory, const QString &commit
connectRepositoryChanged(workingDirectory, cmd);
}
void GitClient::softReset(const QString &workingDirectory, const QString &commit)
{
if (commit.isEmpty())
return;
QStringList arguments;
arguments << QLatin1String("reset") << QLatin1String("--soft") << commit;
VcsBase::Command *cmd = executeGit(workingDirectory, arguments, 0, true);
connectRepositoryChanged(workingDirectory, cmd);
}
void GitClient::addFile(const QString &workingDirectory, const QString &fileName)
{
QStringList arguments;