diff options
| author | Michael Muré <batolettre@gmail.com> | 2022-08-23 15:01:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-23 15:01:36 +0200 |
| commit | 5a70e8b3a2e0fe3d1a1dcd4c24bb6bf64633cb7f (patch) | |
| tree | e5382a09a45098672b6d60397eac201617fdd6ec /bridge/jira | |
| parent | 81fd7a5d8b6443e65c861f00a7387c0a3c926c66 (diff) | |
| parent | 6ed4b8b7a1185ad278eb2e40b32e859f828233d9 (diff) | |
| download | git-bug-5a70e8b3a2e0fe3d1a1dcd4c24bb6bf64633cb7f.tar.gz | |
Merge pull request #664 from MichaelMure/combined-id-rework
bug: have a type for combined ids, fix #653
Diffstat (limited to 'bridge/jira')
| -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, |