okay

1 files changed, 7 insertions, 11 deletions

diff --git a/doMerge.go b/doMerge.go
index c359ecc..cde6b1e 100644
--- a/doMerge.go
+++ b/doMerge.go
@@ -14,8 +14,6 @@ import (
 )
 
 func doMerge() (string, error) {
-	var s string
-	var err error
 	if argv.All == true {
 		start := time.Now()
 		repos, err := doMergeDevel()
@@ -52,21 +50,19 @@ func doMerge() (string, error) {
 		return log.Sprintf("Merged %d master branches in %s", repos.Len(), shell.FormatDuration(dur)), nil
 	}
 	if argv.Merge.Check != nil {
-		err = safeToPublish()
+		err := safeToPublish()
 		if err == nil {
 			return "probably safe to publish and merge", nil
 		}
 		return "Not safe to Publish.", err
 	}
-	s, err = findWorkRepos()
-	// found some repos at least
-	if err == nil {
-		// every repo is in a really clean state. no extra files anywhere
-		// no dirty repos, no repos that need to be published
-		// nothing different between user and master branch version. not common
-		log.Info("There does't seem to be anything to merge. Your repos are very consistent.")
+	found := findWorkRepos()
+	if found.Len() == 0 {
+		return "There does't seem to be anything to merge. Show your repos with --show", nil
 	}
-	return s, err
+	found.SortNamespace()
+	footer := me.forge.PrintDefaultTB(found)
+	return "repos that can't be merged: " + footer, nil
 }
 
 func hashesMatch(repo *gitpb.Repo) error {