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

Fixes commiting with empty author/email information

Browse Source 
Also only filling in the author field works, git does magic then.
Also fix quoting
This commit is contained in:
dt
2009-12-11 13:57:05 +01:00
parent c7850c3f98
commit 839bc1e941
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/git/commitdata.cpp
View File

@@ -61,9 +61,12 @@ void GitSubmitEditorPanelData::clear()
QString GitSubmitEditorPanelData::authorString() const
{
QString rc;
rc += QLatin1Char('"');
rc += author;
rc += QLatin1String("\" <");
if (email.isEmpty())
return rc;
rc += QLatin1String(" <");
rc += email;
rc += QLatin1Char('>');
return rc;

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

@@ -791,8 +791,11 @@ bool GitClient::addAndCommit(const QString &repositoryDirectory,
// Do the final commit
QStringList args;
args << QLatin1String("commit")
<< QLatin1String("-F") << QDir::toNativeSeparators(messageFile)
<< QLatin1String("--author") << data.authorString();
<< QLatin1String("-F") << QDir::toNativeSeparators(messageFile);
const QString &authorString = data.authorString();
if (!authorString.isEmpty())
args << QLatin1String("--author") << authorString;
QByteArray outputText;
QByteArray errorText;