Merge f259001 into 0b1a23e

Nordstrom · Nov 6, 2018 · 9d4993a · 9d4993a
2 parents 0b1a23e + f259001
commit 9d4993a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/index.js b/index.js
@@ -58,7 +58,7 @@ function loadConfig () {
 
 function getEnvIdFromBranch () {
   try {
-    let branch = sh.exec('git name-rev HEAD --name-only').stdout
+    let branch = sh.exec('git rev-parse --abbrev-ref HEAD').stdout.replace(/\n/g, '')
 
     branch = _.last(_.split(branch, '/'))
 

diff --git a/test/_env.js b/test/_env.js
@@ -4,7 +4,7 @@ const _ = require('lodash')
 const sh = require('shelljs')
 
 module.exports = function (regex) {
-  var env = sh.exec('git name-rev HEAD --name-only').stdout
+  var env = sh.exec('git rev-parse --abbrev-ref HEAD').stdout.replace(/\n/g, '')
 
   env = _.last(_.split(env, '/'))