diff options
Diffstat (limited to 'doPatch.go')
| -rw-r--r-- | doPatch.go | 11 |
1 files changed, 4 insertions, 7 deletions
@@ -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 |
