Merge pull request #2798 from ypid/fixed_get_git_hash

Get git commit hash even if the repo only points to a bare repo.

1 files changed, 8 insertions, 2 deletions

diff --git a/src/node/utils/Settings.js b/src/node/utils/Settings.js
index ec327fb6..f76cebdc 100644
--- a/src/node/utils/Settings.js
+++ b/src/node/utils/Settings.js
@@ -228,8 +228,14 @@ exports.getGitCommit = function() {
   try
   {
     var rootPath = path.resolve(npm.dir, '..');
-    var ref = fs.readFileSync(rootPath + "/.git/HEAD", "utf-8");
-    var refPath = rootPath + "/.git/" + ref.substring(5, ref.indexOf("\n"));
+    if (fs.lstatSync(rootPath + '/.git').isFile()) {
+      rootPath = fs.readFileSync(rootPath + '/.git', "utf8");
+      rootPath = rootPath.split(' ').pop().trim();
+    } else {
+      rootPath += '/.git';
+    }
+    var ref = fs.readFileSync(rootPath + "/HEAD", "utf-8");
+    var refPath = rootPath + "/" + ref.substring(5, ref.indexOf("\n"));
     version = fs.readFileSync(refPath, "utf-8");
     version = version.substring(0, 7);
   }