fix: modify fetch function to handle CircleCI specifics

2019-12-03 18:07:12 -05:00
parent b2c1b2c670
commit cbef9d18da
6 changed files with 114 additions and 28 deletions
@@ -119,7 +119,7 @@ async function isRefExists(ref, execaOpts) {
 * @param {String} branch The repository branch to fetch.
 * @param {Object} [execaOpts] Options to pass to `execa`.
 */
-async function fetch(repositoryUrl, branch, execaOpts) {
+async function fetch(repositoryUrl, branch, ciBranch, execaOpts) {
  const isLocalExists =
    (await execa('git', ['rev-parse', '--verify', branch], {...execaOpts, reject: false})).exitCode === 0;

@@ -130,7 +130,9 @@ async function fetch(repositoryUrl, branch, execaOpts) {
        'fetch',
        '--unshallow',
        '--tags',
-        ...(isLocalExists ? [repositoryUrl] : [repositoryUrl, `+refs/heads/${branch}:refs/heads/${branch}`]),
+        ...(branch === ciBranch && isLocalExists
+          ? [repositoryUrl]
+          : ['--update-head-ok', repositoryUrl, `+refs/heads/${branch}:refs/heads/${branch}`]),
      ],
      execaOpts
    );
@@ -140,7 +142,9 @@ async function fetch(repositoryUrl, branch, execaOpts) {
      [
        'fetch',
        '--tags',
-        ...(isLocalExists ? [repositoryUrl] : [repositoryUrl, `+refs/heads/${branch}:refs/heads/${branch}`]),
+        ...(branch === ciBranch && isLocalExists
+          ? [repositoryUrl]
+          : ['--update-head-ok', repositoryUrl, `+refs/heads/${branch}:refs/heads/${branch}`]),
      ],
      execaOpts
    );