narrowing it down

1 files changed, 14 insertions, 7 deletions

diff --git a/doStats.go b/doStats.go
index 3723e36..09ec0c7 100644
--- a/doStats.go
+++ b/doStats.go
@@ -42,8 +42,8 @@ func doVerify() (string, error) {
 	allerr = errors.Join(allerr, err)
 	log.Printf("user=%10.10s master=%10.10s HEAD=%10.10s\n", user, master, HEAD)
 
-	safeDelete(repo, user, HEAD)                                     // delete user if safely contained in HEAD
-	safeDelete(repo, "refs/heads/" + repo.GetUserBranchName(), "refs/remotes/origin/HEAD") // delete user if safely contained in HEAD
+	safeDelete(repo, user, HEAD)                                                         // delete user if safely contained in HEAD
+	safeDelete(repo, "refs/heads/"+repo.GetUserBranchName(), "refs/remotes/origin/HEAD") // delete user if safely contained in HEAD
 
 	return s, allerr
 }
@@ -191,6 +191,7 @@ func safeDelete(r *gitpb.Repo, deleteHash string, keepHash string) error {
 	if len(hashbad) > 0 {
 		log.Printf("%-13.13s %v\n", "BAD cmd", cmd1)
 	}
+	var ACTUALLYOK bool = true
 	// things still only in the local branch (bad to delete)
 	for _, line := range hashbad {
 		parts := strings.Split(line, "%00") // git log doesn't actually convert %00 to NULL
@@ -199,19 +200,25 @@ func safeDelete(r *gitpb.Repo, deleteHash string, keepHash string) error {
 		searchResult := log.Sprintf("NOPE(%d)", r.Stats.Len())
 		stat := findPatchIdInStats(r.Stats, patchId)
 		if stat != nil {
-			searchResult = log.Sprintf("YES %10.10s %s", stat.PatchId, stat.Name)
+			searchResult = log.Sprintf("FOUND %10.10s %s", stat.PatchId, stat.Subject)
+		} else {
+			ACTUALLYOK = false
 		}
 
 		log.Printf("%-13.13s %-55.55s hId %10.10s pId %10.10s %s %v\n", "BAD keep", r.FullPath, parts[0], patchId, searchResult, parts[2:])
 	}
 
-	if len(hashbad) == 0 {
+	if ACTUALLYOK {
 		// todo: force checkout to local master branch
 		// before doing this
 		cmd := []string{"git", "update-ref", "-d", deleteHash}
-		log.Printf("%-13.13s %-55.55s %v %s\n", "CMD OK", r.FullPath, cmd1, "")
-		log.Printf("%-13.13s %-55.55s %v %s\n", "CMD OK", r.FullPath, cmd2, "")
-		log.Printf("%-13.13s %-55.55s %v %s\n", "SAFE TO DELETE", r.FullPath, cmd, "add --fix")
+		// log.Printf("%-13.13s %-55.55s %v %s\n", "CMD OK", r.FullPath, cmd1, "")
+		// log.Printf("%-13.13s %-55.55s %v %s\n", "CMD OK", r.FullPath, cmd2, "")
+		if r.GetCurrentBranchName() == r.GetMasterBranchName() {
+			log.Printf("%-55.55s %v %s\n", r.FullPath, cmd, "SAFE TO DELETE add --fix")
+		} else {
+			log.Printf("%-55.55s %v %s\n", r.FullPath, cmd, "SAFE TO DELETE BUT NOT ON MASTER BRANCH add --fix")
+		}
 		if argv.Fix {
 			err := r.RunVerbose(cmd)
 			if err != nil {