diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | doPull.go | 10 |
2 files changed, 6 insertions, 6 deletions
@@ -7,7 +7,7 @@ BUILDTIME = $(shell date +%Y.%m.%d_%H%M) # make andlabs # try the andlabs gui plugin (uses GTK) default: install-verbose - forge pull check + # forge pull check vet: @GO111MODULE=off go vet @@ -148,6 +148,9 @@ func rillPull(repo *gitpb.Repo) error { } return nil } + if err := repo.RunVerbose([]string{"git", "fetch", "origin", "--prune"}); err != nil { + return err + } cur := repo.GetCurrentBranchName() if !repo.IsBranchRemote(cur) { if argv.Verbose { @@ -156,11 +159,8 @@ func rillPull(repo *gitpb.Repo) error { return nil } - var cmd []string - cmd = append(cmd, "git", "pull") - err := repo.RunVerbose(cmd) - if err != nil { - log.Info(repo.GetFullPath(), "git pull err:", err) + if err := repo.RunVerbose([]string{"git", "pull"}); err != nil { + return err } return nil } |
