fix: error when trying to lock same number

christophehurpeau · Apr 14, 2019 · 0198901 · 0198901
1 parent ae2e210
commit 0198901
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 3 deletions.
diff --git a/dist/context/repoContext.d.ts.map b/dist/context/repoContext.d.ts.map
diff --git a/dist/index-node10-dev.cjs.js b/dist/index-node10-dev.cjs.js
diff --git a/dist/index-node10-dev.cjs.js.map b/dist/index-node10-dev.cjs.js.map
diff --git a/dist/index-node10.cjs.js b/dist/index-node10.cjs.js
diff --git a/dist/index-node10.cjs.js.map b/dist/index-node10.cjs.js.map
diff --git a/src/context/repoContext.ts b/src/context/repoContext.ts
@@ -136,6 +136,7 @@ async function initRepoContext<GroupNames extends string>(
     getMergeLocked: () => lockMergePrNumber,
     addMergeLock: (prNumber): void => {
       console.log('merge lock: lock', { prNumber });
+      if (lockMergePrNumber === prNumber) return;
       if (lockMergePrNumber) throw new Error('Already have lock id');
       lockMergePrNumber = prNumber;
     },