From 839bc1e941f91bb72b066d6a3a0781cd7c77d057 Mon Sep 17 00:00:00 2001
From: dt <qtc-committer@nokia.com>
Date: Fri, 11 Dec 2009 13:57:05 +0100
Subject: [PATCH] Fixes commiting with empty author/email information
Also only filling in the author field works, git does magic then.
Also fix quoting
---
src/plugins/git/commitdata.cpp | 7 +++++--
src/plugins/git/gitclient.cpp | 7 +++++--
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/plugins/git/commitdata.cpp b/src/plugins/git/commitdata.cpp
index e16b372eae8..f3b320ae57f 100644
--- a/src/plugins/git/commitdata.cpp
+++ b/src/plugins/git/commitdata.cpp
@@ -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;
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp
index e5bbd87a37e..cc1f2bdfa9d 100644
--- a/src/plugins/git/gitclient.cpp
+++ b/src/plugins/git/gitclient.cpp
@@ -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;
--
GitLab