diff --git a/CHANGELOG.md b/CHANGELOG.md index 42ecac29..a8c30b8b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,7 @@ and this project somewhat adheres to [Semantic Versioning](https://semver.org/sp - Fix some `INCBIN` statements not being parsed correctly. - Fix excessive logging if Porymap fails to monitor all map files. - Fix map connections getting cut off in exported map images if they're on the same side as another short map connection. +- Fix the project version check failing for some versions of `git`. ## [6.2.0] - 2025-08-08 ### Added diff --git a/src/project.cpp b/src/project.cpp index 6fd27b17..0826d62c 100644 --- a/src/project.cpp +++ b/src/project.cpp @@ -95,8 +95,7 @@ int Project::getSupportedMajorVersion(QString *errorOut) { // First we need to know which (if any) known history this project belongs to. // We'll get the root commit, then compare it to the known root commits for the base project repos. - static const QStringList args_getRootCommit = { "rev-list", "--max-parents=0", "HEAD" }; - process.setArguments(args_getRootCommit); + process.setArguments({ "-c", QString("safe.directory=%1").arg(this->root), "rev-list", "--max-parents=0", "HEAD" }); process.start(); if (!process.waitForFinished(timeoutLimit) || process.exitStatus() != QProcess::ExitStatus::NormalExit || process.exitCode() != 0) { if (errorOut) { @@ -158,7 +157,7 @@ int Project::getSupportedMajorVersion(QString *errorOut) { // An empty commit hash means 'consider any point in the history a supported version' return versionNum; } - process.setArguments({ "merge-base", "--is-ancestor", commitHash, "HEAD" }); + process.setArguments({ "-c", QString("safe.directory=%1").arg(this->root), "merge-base", "--is-ancestor", commitHash, "HEAD" }); process.start(); if (!process.waitForFinished(timeoutLimit) || process.exitStatus() != QProcess::ExitStatus::NormalExit) { if (errorOut) {