libre-service.eu/pad.libre-service.eu-etherpad
libre-service.eu/pad.libre-service.eu-etherpad
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-01-31 19:02:59 +01:00
Code Issues Projects Releases Wiki Activity

utils: Fix commit checking on detached HEAD

Browse source
This commit is contained in:
Andrew Dassonville 2020-10-22 15:05:12 -07:00 committed by Richard Hansen
parent cb5fcbb74e
commit bee1ae06d8
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/node/utils/Settings.js
View file

@ -423,8 +423,12 @@ exports.getGitCommit = function() {
rootPath += '/.git'; rootPath += '/.git';
} }
var ref = fs.readFileSync(rootPath + "/HEAD", "utf-8"); var ref = fs.readFileSync(rootPath + "/HEAD", "utf-8");
var refPath = rootPath + "/" + ref.substring(5, ref.indexOf("\n")); if (ref.startsWith("ref: ")) {
version = fs.readFileSync(refPath, "utf-8"); var refPath = rootPath + "/" + ref.substring(5, ref.indexOf("\n"));
version = fs.readFileSync(refPath, "utf-8");
} else {
version = ref;
}
version = version.substring(0, 7); version = version.substring(0, 7);
} catch(e) { } catch(e) {
console.warn("Can't get git version for server header\n" + e.message) console.warn("Can't get git version for server header\n" + e.message)