diff options
| author | Michael Muré <batolettre@gmail.com> | 2021-05-03 11:45:15 +0200 |
|---|---|---|
| committer | Michael Muré <batolettre@gmail.com> | 2022-08-22 13:25:26 +0200 |
| commit | 45b04351d8d02e53b3401b0ee23f7cbe750b63cd (patch) | |
| tree | 59d203ef6c0f6a497b7074cd5617c8869cac3b14 /bridge/jira/import.go | |
| parent | 43026fc53669d462a60feec7d22aec090959be72 (diff) | |
| download | git-bug-45b04351d8d02e53b3401b0ee23f7cbe750b63cd.tar.gz | |
bug: have a type for combined ids, fix https://github.com/MichaelMure/git-bug/issues/653
Diffstat (limited to 'bridge/jira/import.go')
| -rw-r--r-- | bridge/jira/import.go | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/bridge/jira/import.go b/bridge/jira/import.go index c297abcf..8043acf4 100644 --- a/bridge/jira/import.go +++ b/bridge/jira/import.go @@ -270,8 +270,7 @@ func (ji *jiraImporter) ensureComment(repo *cache.RepoCache, b *cache.BugCache, return err } - targetOpID, err := b.ResolveOperationWithMetadata( - metaKeyJiraId, item.ID) + targetOpID, err := b.ResolveOperationWithMetadata(metaKeyJiraId, item.ID) if err != nil && err != cache.ErrNoMatchingOp { return err } @@ -334,7 +333,7 @@ func (ji *jiraImporter) ensureComment(repo *cache.RepoCache, b *cache.BugCache, op, err := b.EditCommentRaw( editor, item.Updated.Unix(), - targetOpID, + entity.CombineIds(b.Id(), targetOpID), text.Cleanup(item.Body), map[string]string{ metaKeyJiraId: derivedID, |