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

Git: Do the right thing when commiting

Browse Source 
Do the right thing when commiting in git. This allows
staged files to be commited without additional changes, etc.

Change-Id: Ib04c91cf9c105c4a2bbe013926112d6d5d3bade6
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
This commit is contained in:
Tobias Hunger
2011-10-19 15:49:13 +00:00
parent 366a9d0d0e
commit 494fbdb0d2
9 changed files with 270 additions and 273 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/git/gitclient.h
View File

@@ -57,6 +57,7 @@ namespace Core {
namespace VCSBase {
class VCSBaseEditorWidget;
class SubmitFileModel;
}
namespace Utils {
@@ -204,16 +205,13 @@ public:
const GitSubmitEditorPanelData &data,
const QString &amendSHA1,
const QString &messageFile,
const QStringList &checkedFiles,
const QStringList &origCommitFiles,
const QStringList &origDeletedFiles);
VCSBase::SubmitFileModel *model);
enum StatusResult { StatusChanged, StatusUnchanged, StatusFailed };
StatusResult gitStatus(const QString &workingDirectory,
bool untracked = false,
QString *output = 0,
QString *errorMessage = 0,
bool *onBranch = 0);
QString *errorMessage = 0, bool *onBranch = 0);
void launchGitK(const QString &workingDirectory);
QStringList synchronousRepositoryBranches(const QString &repositoryURL);