prune branches on pullv0.25.43

2 files changed, 6 insertions, 6 deletions

diff --git a/Makefile b/Makefile
index a1cd2b2..97a82ea 100644
--- a/Makefile
+++ b/Makefile
@@ -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
diff --git a/doPull.go b/doPull.go
index a2b2a82..80405ff 100644
--- a/doPull.go
+++ b/doPull.go
@@ -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
 }