github: tighten the import matching

Michael Muré created 5 years ago

Change summary

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

Detailed changes

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
 	}