Merge branch 'master' into beta

test/helpers/git-utils.js

@@ -69,8 +69,9 @@ export async function initBareRepo(repositoryUrl, branch = 'master') {
  * @returns {Array<Commit>} The created commits, in reverse order (to match `git log` order).
  */
 export async function gitCommits(messages, execaOpts) {
-  await pEachSeries(messages, message =>
-    execa.stdout('git', ['commit', '-m', message, '--allow-empty', '--no-gpg-sign'], execaOpts)
+  await pEachSeries(
+    messages,
+    async message => (await execa('git', ['commit', '-m', message, '--allow-empty', '--no-gpg-sign'], execaOpts)).stdout
   );
   return (await gitGetCommits(undefined, execaOpts)).slice(0, messages.length);
 }
@@ -112,8 +113,8 @@ export async function gitCheckout(branch, create = true, execaOpts) {
  *
  * @return {String} The sha of the head commit in the current git repository.
  */
-export function gitHead(execaOpts) {
-  return execa.stdout('git', ['rev-parse', 'HEAD'], execaOpts);
+export async function gitHead(execaOpts) {
+  return (await execa('git', ['rev-parse', 'HEAD'], execaOpts)).stdout;
 }
 
 /**
@@ -181,8 +182,8 @@ export async function gitAddConfig(name, value, execaOpts) {
  *
  * @return {String} The sha of the commit associated with `tagName` on the local repository.
  */
-export function gitTagHead(tagName, execaOpts) {
-  return execa.stdout('git', ['rev-list', '-1', tagName], execaOpts);
+export async function gitTagHead(tagName, execaOpts) {
+  return (await execa('git', ['rev-list', '-1', tagName], execaOpts)).stdout;
 }
 
 /**
@@ -195,7 +196,7 @@ export function gitTagHead(tagName, execaOpts) {
  * @return {String} The sha of the commit associated with `tagName` on the remote repository.
  */
 export async function gitRemoteTagHead(repositoryUrl, tagName, execaOpts) {
-  return (await execa.stdout('git', ['ls-remote', '--tags', repositoryUrl, tagName], execaOpts))
+  return (await execa('git', ['ls-remote', '--tags', repositoryUrl, tagName], execaOpts)).stdout
     .split('\n')
     .filter(tag => Boolean(tag))
     .map(tag => tag.match(/^(\S+)/)[1])[0];
@@ -209,8 +210,8 @@ export async function gitRemoteTagHead(repositoryUrl, tagName, execaOpts) {
  *
  * @return {String} The tag associatedwith the sha in parameter or `null`.
  */
-export function gitCommitTag(gitHead, execaOpts) {
-  return execa.stdout('git', ['describe', '--tags', '--exact-match', gitHead], execaOpts);
+export async function gitCommitTag(gitHead, execaOpts) {
+  return (await execa('git', ['describe', '--tags', '--exact-match', gitHead], execaOpts)).stdout;
 }
 
 /**