From 893b1e9a16a64ed5444fcc587ee8d97bf373fb6c Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Tue, 25 Jun 2013 23:32:39 +0300
Subject: [PATCH] Git: Support commit.template under ~
Task-number: QTCREATORBUG-9530
Change-Id: I21ee4202aa750a9d4d89f05d51af7c63489eb6c3
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
---
src/plugins/git/gitclient.cpp | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp
index 155769d995f..d8d279ee1d0 100644
--- a/src/plugins/git/gitclient.cpp
+++ b/src/plugins/git/gitclient.cpp
@@ -2686,8 +2686,11 @@ bool GitClient::getCommitData(const QString &workingDirectory,
QString templateFilename = gitDirectory.absoluteFilePath(QLatin1String("MERGE_MSG"));
if (!QFile::exists(templateFilename))
templateFilename = gitDirectory.absoluteFilePath(QLatin1String("SQUASH_MSG"));
- if (!QFile::exists(templateFilename))
- templateFilename = readConfigValue(workingDirectory, QLatin1String("commit.template"));
+ if (!QFile::exists(templateFilename)) {
+ Utils::FileName templateName = Utils::FileName::fromUserInput(
+ readConfigValue(workingDirectory, QLatin1String("commit.template")));
+ templateFilename = templateName.toString();
+ }
if (!templateFilename.isEmpty()) {
// Make relative to repository
const QFileInfo templateFileInfo(templateFilename);
--
GitLab