Merge pull request #556 from 5nord/366-multiple-bugs-with-gitlab-bridge

Michael Muré created 4 years ago

Fix comparison mix-up in gitlab importer

Change summary

bridge/gitlab/import.go | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Detailed changes

bridge/gitlab/import.go

@@ -127,8 +127,8 @@ func (gi *gitlabImporter) ensureIssue(repo *cache.RepoCache, issue *gitlab.Issue
 	b, err := repo.ResolveBugMatcher(func(excerpt *cache.BugExcerpt) bool {
 		return excerpt.CreateMetadata[core.MetaKeyOrigin] == target &&
 			excerpt.CreateMetadata[metaKeyGitlabId] == parseID(issue.IID) &&
-			excerpt.CreateMetadata[metaKeyGitlabBaseUrl] == gi.conf[confKeyProjectID] &&
-			excerpt.CreateMetadata[metaKeyGitlabProject] == gi.conf[confKeyGitlabBaseUrl]
+			excerpt.CreateMetadata[metaKeyGitlabBaseUrl] == gi.conf[confKeyGitlabBaseUrl] &&
+			excerpt.CreateMetadata[metaKeyGitlabProject] == gi.conf[confKeyProjectID]
 	})
 	if err == nil {
 		return b, nil