From b71471c61e09d895f2439f24b503db1bd891d57a Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Sun, 7 Sep 2025 22:49:23 -0500 Subject: more general work for patches --- doMerge.go | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'doMerge.go') diff --git a/doMerge.go b/doMerge.go index 518b483..f30358b 100644 --- a/doMerge.go +++ b/doMerge.go @@ -4,10 +4,27 @@ package main import ( + "go.wit.com/lib/protobuf/forgepb" "go.wit.com/lib/protobuf/gitpb" "go.wit.com/log" ) +func doMergeReport() *forgepb.Patches { + found := forgepb.NewPatches() + for repo := range me.forge.Repos.IterAll() { + if repo.GetDevelVersion() == repo.GetMasterVersion() { + continue + } + tmp := log.Sprintf("%s..%s", repo.GetMasterVersion(), repo.GetDevelVersion()) + r, err := repo.RunStrict([]string{"git", "log", "--pretty=format:%H", tmp}) + _ = err + for i, line := range r.Stdout { + log.Info(i, line, repo.FullPath) + } + } + return found +} + func doMergeDevel() (*gitpb.Repos, error) { var err error done := gitpb.NewRepos() @@ -37,7 +54,6 @@ func doMergeDevel() (*gitpb.Repos, error) { } done.Append(repo) } - configSave = true return done, err } -- cgit v1.2.3