summaryrefslogtreecommitdiff
path: root/doSync.go
diff options
context:
space:
mode:
Diffstat (limited to 'doSync.go')
-rw-r--r--doSync.go13
1 files changed, 2 insertions, 11 deletions
diff --git a/doSync.go b/doSync.go
index 07e00a5..f6a9683 100644
--- a/doSync.go
+++ b/doSync.go
@@ -9,7 +9,6 @@ import (
"time"
"go.wit.com/lib/gui/shell"
- "go.wit.com/lib/protobuf/forgepb"
"go.wit.com/lib/protobuf/gitpb"
"go.wit.com/log"
)
@@ -28,11 +27,7 @@ func doSync() error {
}
func doSyncClean() error {
- me.argvCheckoutMaster = true
- me.forge.Config.Mode = forgepb.ForgeMode_MASTER
- me.forge.Config.ConfigSave()
-
- if err := doCheckoutShared(); err != nil {
+ if err := doAllCheckoutMaster(); err != nil {
return err
}
@@ -73,12 +68,8 @@ func doSyncUser() error {
log.Info("Rill syncDevelBranch() ok count =", count)
}
- me.argvCheckoutUser = true
- me.forge.Config.Mode = forgepb.ForgeMode_USER
- me.forge.Config.ConfigSave()
-
argv.Force = true
- if err := doCheckoutShared(); err != nil {
+ if err := doAllCheckoutUser(); err != nil {
return err
}