From fae3b2e7db1249b4a284c80e5050f56c0143d041 Mon Sep 17 00:00:00 2001
From: Michael Muré <batolettre@gmail.com>
Date: Sat, 28 Mar 2020 17:08:27 +0100
Subject: github: tighten the import matching

---
 bridge/github/import.go | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'bridge/github')

diff --git a/bridge/github/import.go b/bridge/github/import.go
index a74c49c5..78e93436 100644
--- a/bridge/github/import.go
+++ b/bridge/github/import.go
@@ -108,7 +108,10 @@ func (gi *githubImporter) ensureIssue(repo *cache.RepoCache, issue issueTimeline
 	}
 
 	// resolve bug
-	b, err := repo.ResolveBugCreateMetadata(metaKeyGithubUrl, issue.Url.String())
+	b, err := repo.ResolveBugMatcher(func(excerpt *cache.BugExcerpt) bool {
+		return excerpt.CreateMetadata[core.MetaKeyOrigin] == target &&
+			excerpt.CreateMetadata[metaKeyGithubId] == parseId(issue.Id)
+	})
 	if err != nil && err != bug.ErrBugNotExist {
 		return nil, err
 	}
-- 
cgit