summaryrefslogtreecommitdiff
path: root/src/plugins/git/gitclient.cpp
diff options
context:
space:
mode:
authorOrgad Shaneh <orgad.shaneh@audiocodes.com>2022-08-18 09:34:06 +0300
committerOrgad Shaneh <orgads@gmail.com>2022-08-26 10:41:27 +0000
commit45aa6a12c47af3310ca31eaae555d9c7bae9391d (patch)
treee09cafd3e61ee649564df68a554c53cb3bafb962 /src/plugins/git/gitclient.cpp
parenta50afa486a656c6a2de7296342ebdda878bbc0c6 (diff)
downloadqt-creator-45aa6a12c47af3310ca31eaae555d9c7bae9391d.tar.gz
Git: Support user configured comment character
Task-number: QTCREATORBUG-28042 Change-Id: I96aea27434ba138637728a7fd7d1450e1eee260a Reviewed-by: André Hartmann <aha_1980@gmx.de>
Diffstat (limited to 'src/plugins/git/gitclient.cpp')
-rw-r--r--src/plugins/git/gitclient.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp
index 2a27ab546e..0c3365e5ad 100644
--- a/src/plugins/git/gitclient.cpp
+++ b/src/plugins/git/gitclient.cpp
@@ -2780,6 +2780,8 @@ bool GitClient::getCommitData(const FilePath &workingDirectory,
*errorMessage = msgNoCommits(false);
return false;
}
+ } else {
+ commitData.commentChar = commentChar(repoDirectory);
}
const StatusResult status = gitStatus(repoDirectory, ShowAll, &output, errorMessage);
switch (status) {
@@ -3550,6 +3552,12 @@ QString GitClient::readConfigValue(const FilePath &workingDirectory, const QStri
return readOneLine(workingDirectory, {"config", configVar});
}
+QChar GitClient::commentChar(const Utils::FilePath &workingDirectory)
+{
+ const QString commentChar = readConfigValue(workingDirectory, "core.commentChar");
+ return commentChar.isEmpty() ? QChar(Constants::DEFAULT_COMMENT_CHAR) : commentChar.at(0);
+}
+
void GitClient::setConfigValue(const FilePath &workingDirectory, const QString &configVar,
const QString &value) const
{