From aff3268ca6a7b6034dfbf9a9cf7ee01005a6a97f Mon Sep 17 00:00:00 2001
From: Jeff Carr <jcarr@wit.com>
Date: Fri, 6 Dec 2024 01:48:17 -0600
Subject: [PATCH] rill git pull works with small settings

---
 Makefile    |  2 ++
 doCommon.go | 28 ++++++++++++++++++++++++++--
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index ab957ed..4231a6d 100644
--- a/Makefile
+++ b/Makefile
@@ -50,6 +50,8 @@ scan: install
 	reset
 	forge --do-scan
 
+pull: install
+	forge --do-git-pull
 
 mine: install
 	forge --find-mine
diff --git a/doCommon.go b/doCommon.go
index db5a0a0..81578bf 100644
--- a/doCommon.go
+++ b/doCommon.go
@@ -1,13 +1,37 @@
 package main
 
-import "go.wit.com/log"
+import (
+	"go.wit.com/lib/protobuf/gitpb"
+	"go.wit.com/log"
+)
 
 func doScan() {
 	me.forge.ScanGoSrc()
 }
 
 func doGitPull() {
-	me.found.RillGitPull()
+	allerr := me.found.RillGitPull(40, 5)
+
+	all := me.found.SortByGoPath()
+	for all.Scan() {
+		repo := all.Next()
+		result := allerr[repo]
+		if result.Error == gitpb.ErrorGitPullOnDirty {
+			log.Info("skip git pull. repo is dirty", repo.GoPath)
+			continue
+		}
+		if result.Error == gitpb.ErrorGitPullOnLocal {
+			log.Info("skip git pull. local branch ", repo.GoPath)
+			continue
+		}
+		if result.Exit == 0 {
+			continue
+		}
+
+		log.Info("git pull error:", repo.GoPath, result.Error)
+		log.Info("git pull error:", repo.GoPath, result.Stdout)
+	}
+
 }
 
 func doFix() {