Skip to content

Commit 3380fa9

Browse files
authored
Merge pull request piceaTech#228 from mschoettle/improve-lookup
Detect existing issues by title and GitLab URL to avoid skipping an item
2 parents e0555de + 7b3eed8 commit 3380fa9

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/index.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,7 @@ async function transferIssues() {
464464
for (let issue of issues) {
465465
// try to find a GitHub issue that already exists for this GitLab issue
466466
let githubIssue = githubIssues.find(
467-
i => i.title.trim() === issue.title.trim()
467+
i => i.title.trim() === issue.title.trim() && i.body.includes(issue.web_url)
468468
);
469469
if (!githubIssue) {
470470
console.log(`\nMigrating issue #${issue.iid} ('${issue.title}')...`);
@@ -563,14 +563,14 @@ async function transferMergeRequests() {
563563
// Try to find a GitHub pull request that already exists for this GitLab
564564
// merge request
565565
let githubRequest = githubPullRequests.find(
566-
i => i.title.trim() === mr.title.trim()
566+
i => i.title.trim() === mr.title.trim() && i.body.includes(mr.web_url)
567567
);
568568
let githubIssue = githubIssues.find(
569569
// allow for issues titled "Original Issue Name - [merged|closed]"
570570
i => {
571571
// regex needs escaping in case merge request title contains special characters
572572
const regex = new RegExp(escapeRegExp(mr.title.trim()) + ' - \\[(merged|closed)\\]');
573-
return regex.test(i.title.trim());
573+
return regex.test(i.title.trim()) && i.body.includes(mr.web_url);
574574
}
575575
);
576576
if (!githubRequest && !githubIssue) {

0 commit comments

Comments
 (0)