fixes to --force and --strict
This commit is contained in:
parent
f43311c36c
commit
f575e95e8f
29
main.go
29
main.go
|
@ -101,24 +101,23 @@ func doMain(repo *gitpb.Repo) error {
|
||||||
log.Info("go install go.wit.com/apps/forge@latest")
|
log.Info("go install go.wit.com/apps/forge@latest")
|
||||||
log.Info("")
|
log.Info("")
|
||||||
return errors.New(repo.GoPath + " is invalid. fix your repository list with 'forge' first")
|
return errors.New(repo.GoPath + " is invalid. fix your repository list with 'forge' first")
|
||||||
} else {
|
|
||||||
log.Info(repo.GoPath, "is valid according to forge")
|
|
||||||
}
|
}
|
||||||
|
log.Info(repo.GoPath, "is valid according to forge")
|
||||||
|
|
||||||
// skip restore if --force
|
// skip restore if --force
|
||||||
if !argv.Force {
|
if argv.Force {
|
||||||
// erase the go.mod and go.sum files
|
repo.Run([]string{"git", "notes", "remove"})
|
||||||
eraseGoMod(repo)
|
}
|
||||||
cname := repo.GetCurrentBranchName()
|
// erase the go.mod and go.sum files
|
||||||
// try to restore from the git metadata
|
cname := repo.GetCurrentBranchName()
|
||||||
if err := repo.AutogenRestore(cname); err != nil {
|
// try to restore from the git metadata
|
||||||
// ignore errors here
|
if err := repo.AutogenRestore(cname); err != nil {
|
||||||
}
|
// ignore errors here
|
||||||
if err := repo.ValidGoSum(); err == nil {
|
}
|
||||||
log.Info(repo.GoPath, "go.mod and go.sum were restored ok")
|
if err := repo.ValidGoSum(); err == nil {
|
||||||
configSave = true
|
log.Info(repo.GoPath, "go.mod and go.sum were restored ok")
|
||||||
return nil
|
configSave = true
|
||||||
}
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// double check here. use --force to remake them
|
// double check here. use --force to remake them
|
||||||
|
|
Loading…
Reference in New Issue