diff options
| author | Michael Muré <michael.mure@consensys.net> | 2019-03-27 21:44:11 +0100 |
|---|---|---|
| committer | Michael Muré <michael.mure@consensys.net> | 2019-03-27 21:44:11 +0100 |
| commit | 24d6714dd59a5c385c21991caa47e5727de043d0 (patch) | |
| tree | 154306261bf98b599e1f3465940bb46c290b8c72 /commands/pull.go | |
| parent | d27e3849b826309bdf2dbf6f30f2a8ac9db71649 (diff) | |
| download | git-bug-24d6714dd59a5c385c21991caa47e5727de043d0.tar.gz | |
cache: properly push/pull identities and bugs
Diffstat (limited to 'commands/pull.go')
| -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) } } |