aboutsummaryrefslogtreecommitdiffstats
path: root/cache
diff options
context:
space:
mode:
authorMichael Muré <batolettre@gmail.com>2018-09-13 11:13:51 +0200
committerMichael Muré <batolettre@gmail.com>2018-09-13 11:13:51 +0200
commit19f43a83c3925ed3d05a4874dcbc84cbb454ea6c (patch)
tree3a1d595a7da57a89f46c595e46aafadaaa198425 /cache
parent27c5ea5b5b57887f51d5700398ee283dc191fff9 (diff)
downloadgit-bug-19f43a83c3925ed3d05a4874dcbc84cbb454ea6c.tar.gz
bug: proper int baked enum for merge result status instead of a string
Diffstat (limited to 'cache')
-rw-r--r--cache/repo_cache.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/cache/repo_cache.go b/cache/repo_cache.go
index d8b14501..0d33494d 100644
--- a/cache/repo_cache.go
+++ b/cache/repo_cache.go
@@ -313,7 +313,7 @@ func (c *RepoCache) MergeAll(remote string) <-chan bug.MergeResult {
id := result.Id
switch result.Status {
- case bug.MsgMergeNew, bug.MsgMergeUpdated:
+ case bug.MergeStatusNew, bug.MergeStatusUpdated:
b := result.Bug
snap := b.Compile()
c.excerpts[id] = NewBugExcerpt(b, &snap)