diff options
| author | Thiago Macieira <[email protected]> | 2015-06-30 20:14:36 -0700 |
|---|---|---|
| committer | Thiago Macieira <[email protected]> | 2015-07-01 16:02:25 +0000 |
| commit | d6da30d77aadf53366a28b6cb10c554762a24766 (patch) | |
| tree | 6c0741a94ec53a834bbc3b245b3d409026e62143 /src/plugins/git/gitclient.h | |
| parent | 1096a101e9c421a6abddc0a96cafc81440b1fe1d (diff) | |
Fix the getting of the Git author name when user.name isn't set
The config variable is not required, as Git will get the user's name
from other system settings, like the gecos field in /etc/passwd. So
adapt Qt Creator to use the same mechanism that Git does.
Change-Id: I255870833a024a36adf6ffff13ecb43cc0c45bbf
Reviewed-by: Orgad Shaneh <[email protected]>
Reviewed-by: Tobias Hunger <[email protected]>
Diffstat (limited to 'src/plugins/git/gitclient.h')
| -rw-r--r-- | src/plugins/git/gitclient.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/git/gitclient.h b/src/plugins/git/gitclient.h index 80b237aa899..d226c686d54 100644 --- a/src/plugins/git/gitclient.h +++ b/src/plugins/git/gitclient.h @@ -293,6 +293,7 @@ public: const QString &messge, QString *name, QString *errorMessage = 0) const; + QString readGitVar(const QString &workingDirectory, const QString &configVar) const; QString readConfigValue(const QString &workingDirectory, const QString &configVar) const; QTextCodec *encoding(const QString &workingDirectory, const QByteArray &configVar) const; @@ -370,6 +371,8 @@ private: // determine version as '(major << 16) + (minor << 8) + patch' or 0. unsigned synchronousGitVersion(QString *errorMessage = 0) const; + QString readOneLine(const QString &workingDirectory, const QStringList &arguments) const; + enum RevertResult { RevertOk, RevertUnchanged, RevertCanceled, RevertFailed }; RevertResult revertI(QStringList files, bool *isDirectory, |