From 598e8686041964e2266b9e57f2c5a7844d7995be Mon Sep 17 00:00:00 2001
From: Jeff Carr <jcarr@wit.com>
Date: Wed, 8 Oct 2025 01:22:47 -0500
Subject: more argv changes

---
 doPatch.go | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'doPatch.go')

diff --git a/doPatch.go b/doPatch.go
index 5b7a5e6..87c8f48 100644
--- a/doPatch.go
+++ b/doPatch.go
@@ -26,8 +26,11 @@ func isPatchingSafe() bool {
 	log.Info("This patch command is not safe to run now")
 	log.Info("you must reset the state of your git repositories. Run:")
 	log.Info("")
-	log.Info("forge normal")
+	log.Info("forge normal (or use --force)")
 	log.Info("")
+	if argv.Force {
+		return true
+	}
 	return false
 }
 
@@ -47,12 +50,6 @@ func doPatch() error {
 		return nil
 	}
 
-	if argv.Patch.Check != nil {
-		log.Info("do something here to find patches merged to devel")
-		// doMergeReport()
-		return nil
-	}
-
 	if argv.Patch.List != nil {
 		err := doPatchList()
 		return err
-- 
cgit v1.2.3