From d207165f6aa89ee95bd41c41a49d68cfa0b46444 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Tue, 13 Mar 2012 22:34:54 +0200 Subject: Git: Allow commit (or amend) when not on a branch Git allows that so why can't we? Useful when in the middle of merge/rebase. Change-Id: Id09da3417904ff29e6dd1b4ef383157e9c4920d3 Reviewed-by: Tobias Hunger --- src/plugins/git/gitclient.cpp | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'src/plugins/git/gitclient.cpp') diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index e7804f3bdf..dab54a13e6 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -1519,7 +1519,7 @@ static inline QString trimFileSpecification(QString fileSpec) } 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. QByteArray outputText; @@ -1537,8 +1537,6 @@ GitClient::StatusResult GitClient::gitStatus(const QString &workingDirectory, bo static const char * NO_BRANCH = "## HEAD (no branch)\n"; const bool branchKnown = !outputText.startsWith(NO_BRANCH); - if (onBranch) - *onBranch = branchKnown; // Is it something really fatal? if (!statusRc && !branchKnown) { 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. - bool onBranch; QString output; - const StatusResult status = gitStatus(repoDirectory, true, &output, errorMessage, &onBranch); + const StatusResult status = gitStatus(repoDirectory, true, &output, errorMessage); switch (status) { case StatusChanged: - if (!onBranch) { - *errorMessage = tr("You did not checkout a branch."); - return false; - } break; case StatusUnchanged: if (amend) -- cgit v1.2.1