aboutsummaryrefslogtreecommitdiffstats
path: root/bridge/github
diff options
context:
space:
mode:
authorMichael Muré <batolettre@gmail.com>2020-03-28 17:11:16 +0100
committerGitHub <noreply@github.com>2020-03-28 17:11:16 +0100
commit58abc6b0a35b679ac0c34579ff1cb53c8fa71af4 (patch)
treea2a9556a580d21f1850c06eeb591a44acc0d2373 /bridge/github
parent5491d12873732d05d2f08cfe784985eee6e41a20 (diff)
parenta8666bfeb8255c2a0a9eed55ba143d65237febbf (diff)
downloadgit-bug-58abc6b0a35b679ac0c34579ff1cb53c8fa71af4.tar.gz
Merge pull request #358 from MichaelMure/gitlab-tests
gitlab: fix issues import url
Diffstat (limited to 'bridge/github')
-rw-r--r--bridge/github/import.go5
1 files changed, 4 insertions, 1 deletions
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
}