WIP

Author: josephperrott

.circleci/rebase-pr.js

@@ -59,12 +59,12 @@ async function _main() {
   console.log();
 
   // Get the count of commits between the latest commit from origin and the common ancestor SHA.
-  const commitCount = exec(`git rev-list --count origin/${refs.base.ref}...${refs.commonAncestorSha}`);
+  const commitCount = exec(`git rev-list --count ${refs.base.remote}/${refs.base.ref}...${refs.commonAncestorSha}`);
   console.log(`Checking ${commitCount} commits for changes in the CircleCI config file.`);
 
   // Check if the files changed between the latest commit from origin and the common ancestor SHA
   // includes the CircleCI config.
-  const circleCIConfigChanged = exec(`git diff --name-only origin/${refs.base.ref} ${refs.commonAncestorSha} -- .circleci/config.yml`);
+  const circleCIConfigChanged = exec(`git diff --name-only ${refs.base.remote}/${refs.base.ref} ${refs.commonAncestorSha} -- .circleci/config.yml`);
 
   if (!!circleCIConfigChanged) {
     throw Error(`
@@ -86,7 +86,7 @@ async function _main() {
   console.log();
 
   // Rebase the PR.
-  exec(`git rebase origin/${refs.base.ref}`);
+  exec(`git rebase ${refs.base.remote}/${refs.base.ref}`);
   console.log(`Rebased current branch onto ${refs.base.ref}.`);
 }