diff options
Diffstat (limited to 'commands')
| -rw-r--r-- | commands/pull.go | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/commands/pull.go b/commands/pull.go index d2d75f3f..5df10dca 100644 --- a/commands/pull.go +++ b/commands/pull.go @@ -6,6 +6,7 @@ import ( "github.com/MichaelMure/git-bug/bug" "github.com/MichaelMure/git-bug/cache" + "github.com/MichaelMure/git-bug/entity" "github.com/MichaelMure/git-bug/util/interrupt" "github.com/spf13/cobra" ) @@ -38,13 +39,13 @@ func runPull(cmd *cobra.Command, args []string) error { fmt.Println("Merging data ...") - for merge := range backend.MergeAll(remote) { - if merge.Err != nil { - fmt.Println(merge.Err) + for result := range backend.MergeAll(remote) { + if result.Err != nil { + fmt.Println(result.Err) } - if merge.Status != bug.MergeStatusNothing { - fmt.Printf("%s: %s\n", bug.FormatHumanID(merge.Id), merge) + if result.Status != entity.MergeStatusNothing { + fmt.Printf("%s: %s\n", bug.FormatHumanID(result.Id), result) } } |