Merge pull request #169 from ViliusS/fix-falsepossitive-duplicates

Use more precise match when searching for duplicate issues

Author: spruce

src/githubHelper.ts

@@ -159,6 +159,7 @@ export class GithubHelper {
         owner: this.githubOwner,
         repo: this.githubRepo,
         state: 'all',
+        labels: 'gitlab merge request',
         per_page: perPage,
         page: page,
       });

src/index.ts

@@ -561,8 +561,12 @@ async function transferMergeRequests() {
       i => i.title.trim() === mr.title.trim()
     );
     let githubIssue = githubIssues.find(
-      // allow for issues titled "Original Issue Name [merged]"
-      i => i.title.trim().includes(mr.title.trim())
+      // allow for issues titled "Original Issue Name - [merged|closed]"
+      i => {
+        // regex needs escaping in case merge request title contains special characters
+        const regex = new RegExp(escapeRegExp(mr.title.trim()) + ' - \\[(merged|closed)\\]');
+        return regex.test(i.title.trim());
+      }
     );
     if (!githubRequest && !githubIssue) {
       if (settings.skipMergeRequestStates.includes(mr.state)) {
@@ -716,3 +720,7 @@ function inform(msg: string) {
   console.log(msg);
   console.log('==================================');
 }
+
+function escapeRegExp(string) {
+   return string.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'); // $& means the whole matched string
+}