reorderv0.25.55

2 files changed, 6 insertions, 10 deletions

diff --git a/doFind.go b/doFind.go
index 66ce22f..445725f 100644
--- a/doFind.go
+++ b/doFind.go
@@ -153,11 +153,6 @@ func findReposWithPatches() *gitpb.Repos {
 	found := gitpb.NewRepos()
 
 	for repo := range me.forge.Repos.IterByFullPath() {
-		if repo.GetTargetVersion() != "" {
-			// add everything that has a target version set
-			found.AppendByFullPath(repo)
-			continue
-		}
 		if repo.IsDirty() {
 			// always add dirty branches
 			found.AppendByFullPath(repo)
@@ -172,6 +167,11 @@ func findReposWithPatches() *gitpb.Repos {
 			continue
 		}
 
+		// ignore read-only repos for checks below here
+		if me.forge.Config.IsReadOnly(repo.GetGoPath()) {
+			continue
+		}
+
 		// show anything that differs between 'devel' & 'master' branches
 		if repo.GetDevelVersion() != repo.GetMasterVersion() {
 			// this repo.State code isn't great, but it got me here quickly
@@ -186,11 +186,6 @@ func findReposWithPatches() *gitpb.Repos {
 			continue
 		}
 
-		// ignore read-only repos for checks below here
-		if me.forge.Config.IsReadOnly(repo.GetGoPath()) {
-			continue
-		}
-
 		// this is an old test to see if the current 'last tag' is accurate and should be removed
 		if repo.GetLastTag() != repo.GetMasterVersion() {
 			found.AppendByFullPath(repo)
diff --git a/doMerge.go b/doMerge.go
index 70583cc..cfed390 100644
--- a/doMerge.go
+++ b/doMerge.go
@@ -97,6 +97,7 @@ func safeToPublish() error {
 		log.Info("you currently have no repos with patches")
 		return log.Errorf("no repos to publish")
 	}
+	me.forge.PrintDefaultTB(found)
 	// check if any are dirty
 	for repo := range found.IterAll() {
 		if repo.CheckDirty() {