fix: use unauthenticated URL to check if branch is up to date

In case the authentication token provided is unauthorized the call to `isBranchUpToDate` will fail due to lack of read permission if that URL is used. As a result the error about outdated local branch will be reported instead of the one about missing permission.
By using the original (unauthenticated) URL `isBranchUpToDate` shouldn't fail due to permission as it requires only read permissions, that are necessarly present as the CI wass able to clone the repo.

SUMMARY.md

@@ -21,6 +21,8 @@
 	- [Travis CI](docs/recipes/travis.md)
 	- [Travis CI with build stages](docs/recipes/travis-build-stages.md)
 	- [GitLab CI](docs/recipes/gitlab-ci.md)
+- [Git hosted services](docs/recipes/README.md)
+	- [Git authentication with SSH keys](docs/recipes/git-auth-ssh-keys.md)
 - [Package managers and languages](docs/recipes/README.md)
 
 ## Developer guide

cli.js

@@ -1,5 +1,3 @@
-const {pickBy, isUndefined} = require('lodash');
-
 const stringList = {
   type: 'string',
   array: true,
@@ -13,6 +11,7 @@ module.exports = async () => {
   const cli = require('yargs')
     .command('$0', 'Run automated package publishing', yargs => {
       yargs.demandCommand(0, 0).usage(`Run automated package publishing
+
 Usage:
   semantic-release [options] [plugins]`);
     })
@@ -20,7 +19,7 @@ Usage:
     .option('r', {alias: 'repository-url', describe: 'Git repository URL', type: 'string', group: 'Options'})
     .option('t', {alias: 'tag-format', describe: 'Git tag format', type: 'string', group: 'Options'})
     .option('e', {alias: 'extends', describe: 'Shareable configurations', ...stringList, group: 'Options'})
-    .option('ci', {describe: 'Toggle CI verifications', default: undefined, type: 'boolean', group: 'Options'})
+    .option('ci', {describe: 'Toggle CI verifications', type: 'boolean', group: 'Options'})
     .option('verify-conditions', {...stringList, group: 'Plugins'})
     .option('analyze-commits', {type: 'string', group: 'Plugins'})
     .option('verify-release', {...stringList, group: 'Plugins'})
@@ -29,16 +28,15 @@ Usage:
     .option('publish', {...stringList, group: 'Plugins'})
     .option('success', {...stringList, group: 'Plugins'})
     .option('fail', {...stringList, group: 'Plugins'})
-    .option('debug', {describe: 'Output debugging information', default: undefined, type: 'boolean', group: 'Options'})
-    .option('d', {alias: 'dry-run', describe: 'Skip publishing', default: undefined, type: 'boolean', group: 'Options'})
-    .option('h', {alias: 'help', default: undefined, group: 'Options'})
-    .option('v', {alias: 'version', default: undefined, group: 'Options'})
+    .option('debug', {describe: 'Output debugging information', type: 'boolean', group: 'Options'})
+    .option('d', {alias: 'dry-run', describe: 'Skip publishing', type: 'boolean', group: 'Options'})
+    .option('h', {alias: 'help', group: 'Options'})
+    .option('v', {alias: 'version', group: 'Options'})
     .strict(false)
     .exitProcess(false);
 
   try {
-    // Remove option with undefined values, as yargs sets non defined options as `undefined`
-    const {help, version, ...opts} = pickBy(cli.argv, value => !isUndefined(value));
+    const {help, version, ...opts} = cli.argv;
 
     if (Boolean(help) || Boolean(version)) {
       process.exitCode = 0;

docs/recipes/circleci-workflows.md

@@ -59,7 +59,7 @@ A `package.json` is required only for [local](../usage/installation.md#local-ins
 ```json
 {
   "devDependencies": {
-    "semantic-release": "^12.0.0"
+    "semantic-release": "^15.0.0"
   }
 }
 ```

docs/recipes/gitlab-ci.md

@@ -51,7 +51,7 @@ A `package.json` is required only for [local](../usage/installation.md#local-ins
 ```json
 {
   "devDependencies": {
-    "semantic-release": "^12.0.0"
+    "semantic-release": "^15.0.0"
   }
 }
 ```

docs/recipes/travis-build-stages.md

@@ -48,7 +48,7 @@ A `package.json` is required only for [local](../usage/installation.md#local-ins
 ```json
 {
   "devDependencies": {
-    "semantic-release": "^12.0.0"
+    "semantic-release": "^15.0.0"
   }
 }
 ```

docs/recipes/travis.md

@@ -83,8 +83,8 @@ A `package.json` is required only for [local](../usage/installation.md#local-ins
 ```json
 {
   "devDependencies": {
-    "semantic-release": "^12.0.0",
-    "travis-deploy-once": "^4.0.0"
+    "semantic-release": "^15.0.0",
+    "travis-deploy-once": "^5.0.0"
   }
 }
 ```

docs/support/FAQ.md

@@ -124,6 +124,20 @@ Yes, the publishing to the npm registry can be disabled with the [`npmPublish`](
 
 See the [`@semantic-release/npm`](https://github.com/semantic-release/npm#semantic-releasenpm) plugin documentation for more details.
 
+## How can I revert a release?
+
+If you have introduced a breaking bug in a release you have 2 options:
+- If you have a fix immediately ready, commit and push it (or merge it via a pull request) to the release branch
+- Otherwise [revert the commit](https://git-scm.com/docs/git-revert) that introduced the bug and push the revert commit (or merge it via a pull request) to the release branch
+
+In both cases **semantic-release** will publish a new release, so your package users' will get the fixed/reverted version.
+
+Depending on the package manager you are using, you might be able to un-publish or deprecate a release, in order to prevent users to download it by accident. For example npm allows you to [un-publish](https://docs.npmjs.com/cli/unpublish) in [next 72 hours](https://www.npmjs.com/policies/unpublish) after releasing or to [deprecate](https://docs.npmjs.com/cli/deprecate) a release.
+
+In any case **do not remove the Git tag associated with the buggy version**, otherwise **semantic-release** will later try to republish that version. Publishing a version after un-publishing is not supported by most package managers.
+
+**Note**: If you are using the default [Angular Commit Message Conventions](https://github.com/angular/angular.js/blob/master/DEVELOPERS.md#-git-commit-guidelines) be aware that it uses a different revert commit format than the standard one created by [git revert](https://git-scm.com/docs/git-revert), contrary to what is [claimed in the  convention](https://github.com/angular/angular.js/blob/master/DEVELOPERS.md#revert). Therefore, if you revert a commit with [`git revert`](https://git-scm.com/docs/git-revert), use the [`--edit` option](https://git-scm.com/docs/git-revert#git-revert---edit) to format the message according to the [Angular revert commit message format](https://github.com/angular/angular.js/blob/master/DEVELOPERS.md#revert). See [conventional-changelog/conventional-changelog#348](https://github.com/conventional-changelog/conventional-changelog/issues/348) for more details.
+
 ## Can I use `.npmrc` options?
 
 Yes, all the [npm configuration options](https://docs.npmjs.com/misc/config) are supported via the [`.npmrc`](https://docs.npmjs.com/files/npmrc) file at the root of your repository.

docs/usage/installation.md

@@ -24,6 +24,6 @@ For other type of projects we recommend installing **semantic-release** directly
 $ npx semantic-release
 ```
 
-**Note:** For a global installation, it's recommended to specify the major **semantic-release** version to install (for example with with `npx semantic-release@12`, or `npm install -g semantic-release@12`). This way your build will not automatically use the next major **semantic-release** release that could possibly break your build. You will have to upgrade manually when a new major version is released.
+**Note:** For a global installation, it's recommended to specify the major **semantic-release** version to install (for example with with `npx semantic-release@15`, or `npm install -g semantic-release@15`). This way your build will not automatically use the next major **semantic-release** release that could possibly break your build. You will have to upgrade manually when a new major version is released.
 
-**Note:** `npx` is a tool bundled with `npm@>=5.2.0`. It is used to conveniently install the semantic-release binary and to execute it. See [What is npx](../support/FAQ.md#what-is-npx) for more details.
+**Note:** `npx` is a tool bundled with `npm@>=5.2.0`. It is used to conveniently install the semantic-release binary and to execute it. See [What is npx](../support/FAQ.md#what-is-npx) for more details.

index.js

@@ -13,7 +13,7 @@ const getLastRelease = require('./lib/get-last-release');
 const {extractErrors} = require('./lib/utils');
 const getGitAuthUrl = require('./lib/get-git-auth-url');
 const logger = require('./lib/logger');
-const {unshallow, verifyAuth, isBranchUpToDate, gitHead: getGitHead, tag, push} = require('./lib/git');
+const {fetch, verifyAuth, isBranchUpToDate, gitHead: getGitHead, tag, push} = require('./lib/git');
 const getError = require('./lib/get-error');
 const {COMMIT_NAME, COMMIT_EMAIL} = require('./lib/definitions/constants');
 
@@ -59,7 +59,7 @@ async function run(options, plugins) {
   try {
     await verifyAuth(options.repositoryUrl, options.branch);
   } catch (err) {
-    if (!(await isBranchUpToDate(options.repositoryUrl, options.branch))) {
+    if (!(await isBranchUpToDate(options.branch))) {
       logger.log(
         "The local branch %s is behind the remote one, therefore a new version won't be published.",
         options.branch
@@ -75,8 +75,7 @@ async function run(options, plugins) {
   logger.log('Call plugin %s', 'verify-conditions');
   await plugins.verifyConditions({options, logger}, {settleAll: true});
 
-  // Unshallow the repo in order to get all the tags
-  await unshallow(options.repositoryUrl);
+  await fetch(options.repositoryUrl);
 
   const lastRelease = await getLastRelease(options.tagFormat, logger);
   const commits = await getCommits(lastRelease.gitHead, options.branch, logger);
@@ -104,7 +103,9 @@ async function run(options, plugins) {
     logger.log('Call plugin %s', 'generate-notes');
     const notes = await plugins.generateNotes(generateNotesParam);
     logger.log('Release note for version %s:\n', nextRelease.version);
-    process.stdout.write(`${marked(notes)}\n`);
+    if (notes) {
+      process.stdout.write(`${marked(notes)}\n`);
+    }
   } else {
     logger.log('Call plugin %s', 'generateNotes');
     nextRelease.notes = await plugins.generateNotes(generateNotesParam);

lib/git.js

@@ -49,12 +49,16 @@ async function isRefInHistory(ref) {
 }
 
 /**
- * Unshallow the git repository (retriving every commits and tags).
+ * Unshallow the git repository if necessary and fetch all the tags.
  *
  * @param {String} repositoryUrl The remote repository URL.
  */
-async function unshallow(repositoryUrl) {
-  await execa('git', ['fetch', '--unshallow', '--tags', repositoryUrl], {reject: false});
+async function fetch(repositoryUrl) {
+  try {
+    await execa('git', ['fetch', '--unshallow', '--tags', repositoryUrl]);
+  } catch (err) {
+    await execa('git', ['fetch', '--tags', repositoryUrl]);
+  }
 }
 
 /**
@@ -141,15 +145,14 @@ async function verifyTagName(tagName) {
 /**
  * Verify the local branch is up to date with the remote one.
  *
- * @param {String} repositoryUrl The remote repository URL.
  * @param {String} branch The repository branch for which to verify status.
  *
  * @return {Boolean} `true` is the HEAD of the current local branch is the same as the HEAD of the remote branch, falsy otherwise.
  */
-async function isBranchUpToDate(repositoryUrl, branch) {
+async function isBranchUpToDate(branch) {
   try {
     return await isRefInHistory(
-      (await execa.stdout('git', ['ls-remote', '--heads', repositoryUrl, branch])).match(/^(\w+)?/)[1]
+      (await execa.stdout('git', ['ls-remote', '--heads', 'origin', branch])).match(/^(\w+)?/)[1]
     );
   } catch (err) {
     debug(err);
@@ -160,7 +163,7 @@ module.exports = {
   gitTagHead,
   gitTags,
   isRefInHistory,
-  unshallow,
+  fetch,
   gitHead,
   repoUrl,
   isGitRepo,

package.json

@@ -35,7 +35,7 @@
     "git-log-parser": "^1.2.0",
     "git-url-parse": "^9.0.0",
     "hook-std": "^1.0.1",
-    "hosted-git-info": "^2.6.0",
+    "hosted-git-info": "^2.7.1",
     "lodash": "^4.17.4",
     "marked": "^0.4.0",
     "marked-terminal": "^3.0.0",
@@ -44,7 +44,7 @@
     "read-pkg-up": "^4.0.0",
     "resolve-from": "^4.0.0",
     "semver": "^5.4.1",
-    "yargs": "^11.0.0"
+    "yargs": "^12.0.0"
   },
   "devDependencies": {
     "ava": "^0.25.0",

test/git.test.js

@@ -3,7 +3,7 @@ import tempy from 'tempy';
 import {
   gitTagHead,
   isRefInHistory,
-  unshallow,
+  fetch,
   gitHead,
   repoUrl,
   tag,
@@ -23,7 +23,8 @@ import {
   gitAddConfig,
   gitCommitTag,
   gitRemoteTagHead,
-  push as pushUtil,
+  gitPush,
+  gitDetachedHead,
 } from './helpers/git-utils';
 
 // Save the current working diretory
@@ -52,7 +53,7 @@ test.serial('Throw error if the last commit sha cannot be found', async t => {
   await t.throws(gitHead(), Error);
 });
 
-test.serial('Unshallow repository', async t => {
+test.serial('Unshallow and fetch repository', async t => {
   // Create a git repository, set the current working directory at the root of the repo
   const repo = await gitRepo();
   // Add commits to the master branch
@@ -63,7 +64,7 @@ test.serial('Unshallow repository', async t => {
   // Verify the shallow clone contains only one commit
   t.is((await gitGetCommits()).length, 1);
 
-  await unshallow(repo);
+  await fetch(repo);
 
   // Verify the shallow clone contains all the commits
   t.is((await gitGetCommits()).length, 2);
@@ -74,7 +75,24 @@ test.serial('Do not throw error when unshallow a complete repository', async t =
   const repo = await gitRepo();
   // Add commits to the master branch
   await gitCommits(['First']);
-  await t.notThrows(unshallow(repo));
+  await t.notThrows(fetch(repo));
+});
+
+test.serial('Fetch all tags on a detached head repository', async t => {
+  const repo = await gitRepo(true);
+
+  await gitCommits(['First']);
+  await gitTagVersion('v1.0.0');
+  await gitCommits(['Second']);
+  await gitTagVersion('v1.0.1');
+  const [commit] = await gitCommits(['Third']);
+  await gitTagVersion('v1.1.0');
+  await gitPush();
+  await gitDetachedHead(repo, commit.hash);
+
+  await fetch(repo);
+
+  t.deepEqual((await gitTags()).sort(), ['v1.0.0', 'v1.0.1', 'v1.1.0'].sort());
 });
 
 test.serial('Verify if the commit `sha` is in the direct history of the current branch', async t => {
@@ -188,11 +206,11 @@ test.serial('Throws error if obtaining the tags fails', async t => {
 });
 
 test.serial('Return "true" if repository is up to date', async t => {
-  const repositoryUrl = await gitRepo(true);
+  await gitRepo(true);
   await gitCommits(['First']);
-  await pushUtil();
+  await gitPush();
 
-  t.true(await isBranchUpToDate(repositoryUrl, 'master'));
+  t.true(await isBranchUpToDate('master'));
 });
 
 test.serial('Return falsy if repository is not up to date', async t => {
@@ -200,23 +218,23 @@ test.serial('Return falsy if repository is not up to date', async t => {
   const repoDir = process.cwd();
   await gitCommits(['First']);
   await gitCommits(['Second']);
-  await pushUtil();
+  await gitPush();
 
-  t.true(await isBranchUpToDate(repositoryUrl, 'master'));
+  t.true(await isBranchUpToDate('master'));
 
   await gitShallowClone(repositoryUrl);
   await gitCommits(['Third']);
-  await pushUtil();
+  await gitPush();
   process.chdir(repoDir);
 
-  t.falsy(await isBranchUpToDate(repositoryUrl, 'master'));
+  t.falsy(await isBranchUpToDate('master'));
 });
 
 test.serial('Return "true" if local repository is ahead', async t => {
-  const repositoryUrl = await gitRepo(true);
+  await gitRepo(true);
   await gitCommits(['First']);
-  await pushUtil();
+  await gitPush();
   await gitCommits(['Second']);
 
-  t.true(await isBranchUpToDate(repositoryUrl, 'master'));
+  t.true(await isBranchUpToDate('master'));
 });

test/helpers/git-utils.js

@@ -151,7 +151,7 @@ export async function gitDetachedHead(repositoryUrl, head) {
   process.chdir(dir);
   await execa('git', ['init']);
   await execa('git', ['remote', 'add', 'origin', repositoryUrl]);
-  await execa('git', ['fetch']);
+  await execa('git', ['fetch', repositoryUrl]);
   await execa('git', ['checkout', head]);
   return dir;
 }
@@ -209,6 +209,6 @@ export async function gitCommitTag(gitHead) {
  * @param {String} branch The branch to push.
  * @throws {Error} if the push failed.
  */
-export async function push(repositoryUrl = 'origin', branch = 'master') {
+export async function gitPush(repositoryUrl = 'origin', branch = 'master') {
   await execa('git', ['push', '--tags', repositoryUrl, `HEAD:${branch}`]);
 }

test/index.test.js

@@ -13,7 +13,7 @@ import {
   gitCommits,
   gitTagVersion,
   gitRemoteTagHead,
-  push,
+  gitPush,
   gitShallowClone,
 } from './helpers/git-utils';
 
@@ -58,7 +58,7 @@ test.serial('Plugins are called with expected values', async t => {
   await gitTagVersion('v1.0.0');
   // Add new commits to the master branch
   commits = (await gitCommits(['Second'])).concat(commits);
-  await push();
+  await gitPush();
 
   const lastRelease = {version: '1.0.0', gitHead: commits[commits.length - 1].hash, gitTag: 'v1.0.0'};
   const nextRelease = {type: 'major', version: '2.0.0', gitHead: await getGitHead(), gitTag: 'v2.0.0'};
@@ -170,7 +170,7 @@ test.serial('Use custom tag format', async t => {
   await gitCommits(['First']);
   await gitTagVersion('test-1.0.0');
   await gitCommits(['Second']);
-  await push();
+  await gitPush();
 
   const nextRelease = {type: 'major', version: '2.0.0', gitHead: await getGitHead(), gitTag: 'test-2.0.0'};
   const notes = 'Release notes';
@@ -207,7 +207,7 @@ test.serial('Use new gitHead, and recreate release notes if a prepare plugin cre
   await gitTagVersion('v1.0.0');
   // Add new commits to the master branch
   commits = (await gitCommits(['Second'])).concat(commits);
-  await push();
+  await gitPush();
 
   const nextRelease = {type: 'major', version: '2.0.0', gitHead: await getGitHead(), gitTag: 'v2.0.0'};
   const notes = 'Release notes';
@@ -267,7 +267,7 @@ test.serial('Call all "success" plugins even if one errors out', async t => {
   await gitTagVersion('v1.0.0');
   // Add new commits to the master branch
   await gitCommits(['Second']);
-  await push();
+  await gitPush();
 
   const nextRelease = {type: 'major', version: '2.0.0', gitHead: await getGitHead(), gitTag: 'v2.0.0'};
   const notes = 'Release notes';
@@ -315,7 +315,7 @@ test.serial('Log all "verifyConditions" errors', async t => {
   const repositoryUrl = await gitRepo(true);
   // Add commits to the master branch
   await gitCommits(['First']);
-  await push();
+  await gitPush();
 
   const error1 = new Error('error 1');
   const error2 = new SemanticReleaseError('error 2', 'ERR2');
@@ -358,7 +358,7 @@ test.serial('Log all "verifyRelease" errors', async t => {
   await gitTagVersion('v1.0.0');
   // Add new commits to the master branch
   await gitCommits(['Second']);
-  await push();
+  await gitPush();
 
   const error1 = new SemanticReleaseError('error 1', 'ERR1');
   const error2 = new SemanticReleaseError('error 2', 'ERR2');
@@ -395,7 +395,7 @@ test.serial('Dry-run skips publish and success', async t => {
   await gitTagVersion('v1.0.0');
   // Add new commits to the master branch
   await gitCommits(['Second']);
-  await push();
+  await gitPush();
 
   const nextRelease = {type: 'major', version: '2.0.0', gitHead: await getGitHead(), gitTag: 'v2.0.0'};
   const notes = 'Release notes';
@@ -444,7 +444,7 @@ test.serial('Dry-run skips fail', async t => {
   await gitTagVersion('v1.0.0');
   // Add new commits to the master branch
   await gitCommits(['Second']);
-  await push();
+  await gitPush();
 
   const error1 = new SemanticReleaseError('error 1', 'ERR1');
   const error2 = new SemanticReleaseError('error 2', 'ERR2');
@@ -479,7 +479,7 @@ test.serial('Force a dry-run if not on a CI and "noCi" is not explicitly set', a
   await gitTagVersion('v1.0.0');
   // Add new commits to the master branch
   await gitCommits(['Second']);
-  await push();
+  await gitPush();
 
   const nextRelease = {type: 'major', version: '2.0.0', gitHead: await getGitHead(), gitTag: 'v2.0.0'};
   const notes = 'Release notes';
@@ -520,6 +520,43 @@ test.serial('Force a dry-run if not on a CI and "noCi" is not explicitly set', a
   t.is(success.callCount, 0);
 });
 
+test.serial('Dry-run does not print changelog if "generateNotes" return "undefined"', async t => {
+  // Create a git repository, set the current working directory at the root of the repo
+  const repositoryUrl = await gitRepo(true);
+  // Add commits to the master branch
+  await gitCommits(['First']);
+  // Create the tag corresponding to version 1.0.0
+  await gitTagVersion('v1.0.0');
+  // Add new commits to the master branch
+  await gitCommits(['Second']);
+  await gitPush();
+
+  const nextRelease = {type: 'major', version: '2.0.0', gitHead: await getGitHead(), gitTag: 'v2.0.0'};
+  const analyzeCommits = stub().resolves(nextRelease.type);
+  const generateNotes = stub().resolves();
+
+  const options = {
+    dryRun: true,
+    branch: 'master',
+    repositoryUrl,
+    verifyConditions: false,
+    analyzeCommits,
+    verifyRelease: false,
+    generateNotes,
+    prepare: false,
+    publish: false,
+    success: false,
+  };
+
+  const semanticRelease = proxyquire('..', {
+    './lib/logger': t.context.logger,
+    'env-ci': () => ({isCi: true, branch: 'master', isPr: false}),
+  });
+  t.truthy(await semanticRelease(options));
+
+  t.deepEqual(t.context.log.args[t.context.log.args.length - 1], ['Release note for version %s:\n', '2.0.0']);
+});
+
 test.serial('Allow local releases with "noCi" option', async t => {
   // Create a git repository, set the current working directory at the root of the repo
   const repositoryUrl = await gitRepo(true);
@@ -529,7 +566,7 @@ test.serial('Allow local releases with "noCi" option', async t => {
   await gitTagVersion('v1.0.0');
   // Add new commits to the master branch
   await gitCommits(['Second']);
-  await push();
+  await gitPush();
 
   const nextRelease = {type: 'major', version: '2.0.0', gitHead: await getGitHead(), gitTag: 'v2.0.0'};
   const notes = 'Release notes';
@@ -583,7 +620,7 @@ test.serial('Accept "undefined" value returned by the "generateNotes" plugins',
   await gitTagVersion('v1.0.0');
   // Add new commits to the master branch
   commits = (await gitCommits(['Second'])).concat(commits);
-  await push();
+  await gitPush();
 
   const lastRelease = {version: '1.0.0', gitHead: commits[commits.length - 1].hash, gitTag: 'v1.0.0'};
   const nextRelease = {type: 'major', version: '2.0.0', gitHead: await getGitHead(), gitTag: 'v2.0.0'};
@@ -648,10 +685,10 @@ test.serial('Returns falsy value if triggered on an outdated clone', async t =>
   // Add commits to the master branch
   await gitCommits(['First']);
   await gitCommits(['Second']);
-  await push();
+  await gitPush();
   await gitShallowClone(repositoryUrl);
   await gitCommits(['Third']);
-  await push();
+  await gitPush();
   process.chdir(repoDir);
 
   const semanticRelease = proxyquire('..', {
@@ -699,7 +736,7 @@ test.serial('Returns falsy value if there is no relevant changes', async t => {
   const repositoryUrl = await gitRepo(true);
   // Add commits to the master branch
   await gitCommits(['First']);
-  await push();
+  await gitPush();
 
   const analyzeCommits = stub().resolves();
   const verifyRelease = stub().resolves();
@@ -749,7 +786,7 @@ test.serial('Exclude commits with [skip release] or [release skip] from analysis
     'Test commit\n\n commit body\n[skip release]',
     'Test commit\n\n commit body\n[release skip]',
   ]);
-  await push();
+  await gitPush();
   const analyzeCommits = stub().resolves();
   const config = {branch: 'master', repositoryUrl, globalOpt: 'global'};
   const options = {
@@ -874,7 +911,7 @@ test.serial('Throw an Error if plugin returns an unexpected value', async t => {
   await gitTagVersion('v1.0.0');
   // Add new commits to the master branch
   await gitCommits(['Second']);
-  await push();
+  await gitPush();
 
   const verifyConditions = stub().resolves();
   const analyzeCommits = stub().resolves('string');
@@ -903,7 +940,7 @@ test.serial('Get all commits including the ones not in the shallow clone', async
   const repositoryUrl = await gitRepo(true);
   await gitTagVersion('v1.0.0');
   await gitCommits(['First', 'Second', 'Third']);
-  await push(repositoryUrl, 'master');
+  await gitPush(repositoryUrl, 'master');
 
   await gitShallowClone(repositoryUrl);
 

test/integration.test.js

@@ -2,7 +2,7 @@ import test from 'ava';
 import {writeJson, readJson} from 'fs-extra';
 import {stub} from 'sinon';
 import execa from 'execa';
-import {gitHead as getGitHead, gitTagHead, gitRepo, gitCommits, gitRemoteTagHead, push} from './helpers/git-utils';
+import {gitHead as getGitHead, gitTagHead, gitRepo, gitCommits, gitRemoteTagHead, gitPush} from './helpers/git-utils';
 import gitbox from './helpers/gitbox';
 import mockServer from './helpers/mockserver';
 import npmRegistry from './helpers/npm-registry';
@@ -609,7 +609,7 @@ test.serial('Exit with 1 if missing permission to push to the remote repository'
   /* Initial release */
   t.log('Commit a feature');
   await gitCommits(['feat: Initial commit']);
-  await push();
+  await gitPush();
   t.log('$ semantic-release');
   const {stdout, code} = await execa(
     cli,