aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--README.md9
-rw-r--r--bridge/github/import.go22
2 files changed, 19 insertions, 12 deletions
diff --git a/README.md b/README.md
index 200b2033..8c51d6d5 100644
--- a/README.md
+++ b/README.md
@@ -48,6 +48,15 @@ That's all !
</details>
+<details><summary>Windows packages</summary>
+
+* [Scoop](https://github.com/ScoopInstaller/Main/blob/master/bucket/git-bug.json)
+ ```
+ scoop install git-bug
+ ```
+
+</details>
+
<details><summary>Linux packages</summary>
* [Archlinux (AUR)](https://aur.archlinux.org/packages/?K=git-bug)
diff --git a/bridge/github/import.go b/bridge/github/import.go
index a41083d2..1db67469 100644
--- a/bridge/github/import.go
+++ b/bridge/github/import.go
@@ -184,7 +184,7 @@ func (gi *githubImporter) ensureIssue(ctx context.Context, repo *cache.RepoCache
// resolve bug
b, err := repo.ResolveBugMatcher(func(excerpt *cache.BugExcerpt) bool {
- return excerpt.CreateMetadata[core.MetaKeyOrigin] == target &&
+ return excerpt.CreateMetadata[metaKeyGithubUrl] == issue.Url.String() &&
excerpt.CreateMetadata[metaKeyGithubId] == parseId(issue.Id)
})
if err == nil {
@@ -195,12 +195,11 @@ func (gi *githubImporter) ensureIssue(ctx context.Context, repo *cache.RepoCache
}
// At Github there exist issues with seemingly empty titles. An example is
- // https://github.com/NixOS/nixpkgs/issues/72730 .
- // The title provided by the GraphQL API actually consists of a space followed by a
- // zero width space (U+200B). This title would cause the NewBugRaw() function to
- // return an error: empty title.
- title := string(issue.Title)
- if title == " \u200b" { // U+200B == zero width space
+ // https://github.com/NixOS/nixpkgs/issues/72730 (here the title is actually
+ // a zero width space U+200B).
+ // Set title to some non-empty string, since git-bug does not accept empty titles.
+ title := text.CleanupOneLine(string(issue.Title))
+ if text.Empty(title) {
title = EmptyTitlePlaceholder
}
@@ -375,12 +374,11 @@ func (gi *githubImporter) ensureTimelineItem(ctx context.Context, repo *cache.Re
}
// At Github there exist issues with seemingly empty titles. An example is
- // https://github.com/NixOS/nixpkgs/issues/72730 .
- // The title provided by the GraphQL API actually consists of a space followed
- // by a zero width space (U+200B). This title would cause the NewBugRaw()
- // function to return an error: empty title.
+ // https://github.com/NixOS/nixpkgs/issues/72730 (here the title is actually
+ // a zero width space U+200B).
+ // Set title to some non-empty string, since git-bug does not accept empty titles.
title := text.CleanupOneLine(string(item.RenamedTitleEvent.CurrentTitle))
- if title == " \u200b" { // U+200B == zero width space
+ if text.Empty(title) {
title = EmptyTitlePlaceholder
}