aboutsummaryrefslogtreecommitdiffstats
path: root/bridge/github
diff options
context:
space:
mode:
authorMichael Muré <batolettre@gmail.com>2020-01-07 19:05:45 +0100
committerGitHub <noreply@github.com>2020-01-07 19:05:45 +0100
commitead3fdd07489c8945ecbd7de6675c4fd49c2877e (patch)
treeeb8f9567bcb621f45777f2b6de675956766285c9 /bridge/github
parentca1d305308d4ee6d0fec16a0af10b62bb52cd265 (diff)
parentee48aef489c91a99b665ab1cd783e241611a3841 (diff)
downloadgit-bug-ead3fdd07489c8945ecbd7de6675c4fd49c2877e.tar.gz
Merge pull request #287 from MichaelMure/github-import-error
Github import error
Diffstat (limited to 'bridge/github')
-rw-r--r--bridge/github/import.go5
1 files changed, 5 insertions, 0 deletions
diff --git a/bridge/github/import.go b/bridge/github/import.go
index dfc851fd..39aebccb 100644
--- a/bridge/github/import.go
+++ b/bridge/github/import.go
@@ -201,6 +201,11 @@ func (gi *githubImporter) ensureIssue(repo *cache.RepoCache, issue issueTimeline
// other edits will be added as CommentEdit operations
target, err := b.ResolveOperationWithMetadata(metaKeyGithubId, parseId(issue.Id))
+ if err == cache.ErrNoMatchingOp {
+ // original comment is missing somehow, issuing a warning
+ gi.out <- core.NewImportWarning(fmt.Errorf("comment ID %s to edit is missing", parseId(issue.Id)), b.Id())
+ continue
+ }
if err != nil {
return nil, err
}