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

Git: Allow commit (or amend) when not on a branch

Browse Source 
Git allows that so why can't we?
Useful when in the middle of merge/rebase.

Change-Id: Id09da3417904ff29e6dd1b4ef383157e9c4920d3
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
This commit is contained in:
Orgad Shaneh
2012-03-13 22:34:54 +02:00
committed by Tobias Hunger
parent 6a3f9460d7
commit d207165f6a
2 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1519,7 +1519,7 @@ static inline QString trimFileSpecification(QString fileSpec)
} }
GitClient::StatusResult GitClient::gitStatus(const QString &workingDirectory, bool untracked, GitClient::StatusResult GitClient::gitStatus(const QString &workingDirectory, bool untracked,
QString *output, QString *errorMessage, bool *onBranch) QString *output, QString *errorMessage)
{ {
// Run 'status'. Note that git returns exitcode 1 if there are no added files. // Run 'status'. Note that git returns exitcode 1 if there are no added files.
QByteArray outputText; QByteArray outputText;
@@ -1537,8 +1537,6 @@ GitClient::StatusResult GitClient::gitStatus(const QString &workingDirectory, bo
static const char * NO_BRANCH = "## HEAD (no branch)\n"; static const char * NO_BRANCH = "## HEAD (no branch)\n";
const bool branchKnown = !outputText.startsWith(NO_BRANCH); const bool branchKnown = !outputText.startsWith(NO_BRANCH);
if (onBranch)
*onBranch = branchKnown;
// Is it something really fatal? // Is it something really fatal?
if (!statusRc && !branchKnown) { if (!statusRc && !branchKnown) {
if (errorMessage) { if (errorMessage) {
@@ -1695,15 +1693,10 @@ bool GitClient::getCommitData(const QString &workingDirectory,
} }
// Run status. Note that it has exitcode 1 if there are no added files. // Run status. Note that it has exitcode 1 if there are no added files.
bool onBranch;
QString output; QString output;
const StatusResult status = gitStatus(repoDirectory, true, &output, errorMessage, &onBranch); const StatusResult status = gitStatus(repoDirectory, true, &output, errorMessage);
switch (status) { switch (status) {
case StatusChanged: case StatusChanged:
if (!onBranch) {
*errorMessage = tr("You did not checkout a branch.");
return false;
}
break; break;
case StatusUnchanged: case StatusUnchanged:
if (amend) if (amend)

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

@@ -212,7 +212,7 @@ public:
StatusResult gitStatus(const QString &workingDirectory, StatusResult gitStatus(const QString &workingDirectory,
bool untracked = false, bool untracked = false,
QString *output = 0, QString *output = 0,
QString *errorMessage = 0, bool *onBranch = 0); QString *errorMessage = 0);
void launchGitK(const QString &workingDirectory); void launchGitK(const QString &workingDirectory);
void launchRepositoryBrowser(const QString &workingDirectory); void launchRepositoryBrowser(const QString &workingDirectory);