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

Git: Expand commit template relative to repository directory

Browse Source 
if it is a relative file specification.
Task-number: QTCREATORBUG-451
This commit is contained in:
Friedemann Kleint
2009-12-14 15:15:45 +01:00
parent 6cdb58aac2
commit 304d398357
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -749,8 +749,12 @@ bool GitClient::getCommitData(const QString &workingDirectory,
d->panelData.email = readConfigValue(workingDirectory, QLatin1String("user.email")); d->panelData.email = readConfigValue(workingDirectory, QLatin1String("user.email"));
// Get the commit template // Get the commit template
const QString templateFilename = readConfigValue(workingDirectory, QLatin1String("commit.template")); QString templateFilename = readConfigValue(workingDirectory, QLatin1String("commit.template"));
if (!templateFilename.isEmpty()) { if (!templateFilename.isEmpty()) {
// Make relative to repository
const QFileInfo templateFileInfo(templateFilename);
if (templateFileInfo.isRelative())
templateFilename = repoDirectory + QLatin1Char('/') + templateFilename;
QFile templateFile(templateFilename); QFile templateFile(templateFilename);
if (templateFile.open(QIODevice::ReadOnly|QIODevice::Text)) { if (templateFile.open(QIODevice::ReadOnly|QIODevice::Text)) {
*commitTemplate = QString::fromLocal8Bit(templateFile.readAll()); *commitTemplate = QString::fromLocal8Bit(templateFile.readAll());