diff options
| author | Michael Muré <batolettre@gmail.com> | 2021-01-24 19:45:21 +0100 |
|---|---|---|
| committer | Michael Muré <batolettre@gmail.com> | 2021-02-14 12:19:00 +0100 |
| commit | dc5059bc3372941e2908739831188768335ac50b (patch) | |
| tree | 7294aed90cf5f04809d7a99b4967b513bdb409d5 /bug/bug_actions.go | |
| parent | 8d63c983c982f93cc48d3996d6bd097ddeeb327f (diff) | |
| download | git-bug-dc5059bc3372941e2908739831188768335ac50b.tar.gz | |
entity: more progress on merging and signing
Diffstat (limited to 'bug/bug_actions.go')
| -rw-r--r-- | bug/bug_actions.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bug/bug_actions.go b/bug/bug_actions.go index aa82356d..40a2facb 100644 --- a/bug/bug_actions.go +++ b/bug/bug_actions.go @@ -112,7 +112,7 @@ func MergeAll(repo repository.ClockedRepo, remote string) <-chan entity.MergeRes return } - out <- entity.NewMergeStatus(entity.MergeStatusNew, id, remoteBug) + out <- entity.NewMergeNewStatus(id, remoteBug) continue } @@ -131,9 +131,9 @@ func MergeAll(repo repository.ClockedRepo, remote string) <-chan entity.MergeRes } if updated { - out <- entity.NewMergeStatus(entity.MergeStatusUpdated, id, localBug) + out <- entity.NewMergeUpdatedStatus(id, localBug) } else { - out <- entity.NewMergeStatus(entity.MergeStatusNothing, id, localBug) + out <- entity.NewMergeNothingStatus(id) } } }() |