summaryrefslogtreecommitdiff
path: root/doPatch.go
diff options
context:
space:
mode:
authorJeff Carr <[email protected]>2025-10-08 01:22:47 -0500
committerJeff Carr <[email protected]>2025-10-08 01:22:47 -0500
commit598e8686041964e2266b9e57f2c5a7844d7995be (patch)
tree7ad45413502fa5d5c447bd6d9ff08a3b7be80230 /doPatch.go
parent3aefc810ff90c80baf1ee485d75551d97f2d5c09 (diff)
more argv changes
Diffstat (limited to 'doPatch.go')
-rw-r--r--doPatch.go11
1 files changed, 4 insertions, 7 deletions
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