Fix detached

index.js

@@ -58,7 +58,7 @@ function loadConfig () {
 
 function getEnvIdFromBranch () {
   try {
-    let branch = sh.exec('git status', { silent: true }).stdout
+    var branch = sh.exec('git status', { silent: true }).stdout
 
     if (!branch || _.includes(branch, 'fatal:')) {
       return
@@ -71,10 +71,15 @@ function getEnvIdFromBranch () {
       branch = branch.replace(new RegExp(_.trim(config.branchRegex)), '$1')
     }
 
-    return _.trimEnd(_.truncate(branch, {
+    branch = _.trimEnd(_.truncate(branch, {
       length: 13,
       omission: ''
     }), '-')
+
+    var hash = sh.exec('git rev-parse HEAD').stdout
+    hash = hash.substring(0, 5)
+
+    return (branch.includes(' ')) ? hash : branch
   } catch (e) {
     console.log('ERR: ', e)
     // Do nothing

test/_env.js

@@ -14,5 +14,8 @@ module.exports = function (regex) {
     omission: ''
   }) : undefined
 
-  return env
+  var hash = sh.exec('git rev-parse HEAD').stdout
+  hash = hash.substring(0, 5)
+
+  return (env.includes(' ')) ? hash : env
 }