From 8b3996d0b9c443269cfc7d146443431740e26381 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Fri, 10 Oct 2025 02:59:56 -0500 Subject: func to help track down dirty() detection problem --- doDirty.go | 17 +++++++++++++---- doPull.go | 6 +++--- main.go | 6 ++++-- 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/doDirty.go b/doDirty.go index c4efbb5..702302a 100644 --- a/doDirty.go +++ b/doDirty.go @@ -3,14 +3,23 @@ package main -func doDirty() { +import "go.wit.com/lib/protobuf/gitpb" + +func doDirty() (string, error) { found := me.forge.CheckDirty() if found.Len() == 0 { - return + return "nothing dirty", nil } + var footer string if argv.Verbose { - me.forge.PrintHumanTableDirty(found) + footer = me.forge.PrintHumanTableDirty(found) } else { - me.forge.PrintHumanTable(found) + footer = me.forge.PrintHumanTable(found) } + return footer, nil +} + +func getDirty() (*gitpb.Repos, string, error) { + found := me.forge.CheckDirty() + return found, "", nil } diff --git a/doPull.go b/doPull.go index d7a334b..de5a42e 100644 --- a/doPull.go +++ b/doPull.go @@ -108,12 +108,12 @@ func doPull() error { log.Info("path deleted while running?", path) continue } - r := repoerr.Append(repo) - r.State = "git pull failed" + r := repoerr.Clone(repo) + r.State = "git pull failed" + repo.State dur := stat.End.Sub(stat.Start) if dur > 1*time.Second { msg := log.Sprintf("pull time (%s)", config.FormatDuration(dur)) - r.State = msg + r.State = msg + repo.State } } repoerr.SortNamespace() diff --git a/main.go b/main.go index 04a4f1e..e4c08ee 100644 --- a/main.go +++ b/main.go @@ -189,8 +189,10 @@ func doDefaultBehavior() (string, error) { func doShow() (string, error) { if argv.Show.Dirty != nil { - doDirty() - return "dirty repos shown", nil + // s, err := doDirty() + _, s, err := getDirty() + me.forge.Repos.Save() + return s, err } if argv.Show.Tag != nil { -- cgit v1.2.3