Merge branch 'master' into pre

scripts/build.js

@@ -30,7 +30,7 @@ const FileSizeReporter = require('react-dev-utils/FileSizeReporter');
 const printBuildError = require('react-dev-utils/printBuildError');
 const childProcess = require('child_process')
 const deploymentBranches = ['master', 'pre', 'dev'];
-const version = childProcess.execSync('git name-rev --name-only HEAD', {'encoding': 'utf8'})
+const version = childProcess.execSync('git symbolic-ref --short -q HEAD', {'encoding': 'utf8'})
 if(!deploymentBranches.includes(version.trim())){
   console.log(chalk.yellow(`当前不在上线分支，请切换至上线分支(${deploymentBranches.join('/')})打包\n`))
   return