diff options
Diffstat (limited to 'doVerifyDevel.go')
| -rw-r--r-- | doVerifyDevel.go | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/doVerifyDevel.go b/doVerifyDevel.go index b8fd419..f002553 100644 --- a/doVerifyDevel.go +++ b/doVerifyDevel.go @@ -1,8 +1,6 @@ package main import ( - "path/filepath" - "go.wit.com/lib/protobuf/gitpb" "go.wit.com/log" ) @@ -24,14 +22,13 @@ func doVerifyDevel() error { continue } - // check if devel branch exists in remote repo devel := repo.GetDevelBranchName() if argv.Verbose { log.Printf("Start clean devel branch: %s %s\n", repo.GetGoPath(), devel) } - if repo.Exists(filepath.Join(".git/refs/remotes/origin", devel)) { - // todo: actually use .git/config + // check if devel branch exists in remote repo + if repo.IsBranchRemote(devel) { if err := doCleanDevelRepo(repo); err != nil { log.Info(repo.GetGoPath(), "verify clean failed") } @@ -40,11 +37,12 @@ func doVerifyDevel() error { } // devel branch is only local /* - devname := repo.GetDevelBranchName() - if err := requiresGitPush(repo, devname); err != nil { - log.Info(repo.GetGoPath(), "is out of sync with upstream") - return err - } + todo: something? + devname := repo.GetDevelBranchName() + if err := requiresGitPush(repo, devname); err != nil { + log.Info(repo.GetGoPath(), "is out of sync with upstream") + return err + } */ } return nil |