diff options
| author | Michael Muré <batolettre@gmail.com> | 2018-09-19 21:16:16 +0200 |
|---|---|---|
| committer | Michael Muré <batolettre@gmail.com> | 2018-09-19 21:45:52 +0200 |
| commit | 63d0b8b72f4bfcf24a393a377288654440d0807d (patch) | |
| tree | d29b5e582de1667cecf15a2a387bf22f22f3f9c7 /cache/repo_cache.go | |
| parent | 2daf2ddcf39c605eaa6c9a5bba82cf5b1efd9a7c (diff) | |
| download | git-bug-63d0b8b72f4bfcf24a393a377288654440d0807d.tar.gz | |
cache: relay early the merge events
Diffstat (limited to 'cache/repo_cache.go')
| -rw-r--r-- | cache/repo_cache.go | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/cache/repo_cache.go b/cache/repo_cache.go index de8b0fa9..7ae8bb1d 100644 --- a/cache/repo_cache.go +++ b/cache/repo_cache.go @@ -332,6 +332,8 @@ func (c *RepoCache) MergeAll(remote string) <-chan bug.MergeResult { results := bug.MergeAll(c.repo, remote) for result := range results { + out <- result + if result.Err != nil { continue } @@ -343,11 +345,7 @@ func (c *RepoCache) MergeAll(remote string) <-chan bug.MergeResult { b := result.Bug snap := b.Compile() c.excerpts[id] = NewBugExcerpt(b, &snap) - - default: } - - out <- result } err := c.write() |