summaryrefslogtreecommitdiff
path: root/doPull.go
diff options
context:
space:
mode:
Diffstat (limited to 'doPull.go')
-rw-r--r--doPull.go29
1 files changed, 1 insertions, 28 deletions
diff --git a/doPull.go b/doPull.go
index 098bd31..a3ce6d6 100644
--- a/doPull.go
+++ b/doPull.go
@@ -43,7 +43,7 @@ func rillPull(repo *gitpb.Repo) error {
// is every repo on the devel branch?
-func doGitPullNew() error {
+func doGitPull() error {
if argv.Pull == nil {
return fmt.Errorf("not really 'fetch pull'")
}
@@ -138,33 +138,6 @@ func doGitPullNew() error {
}
-/*
-func doGitPull() {
- allerr := me.found.RillGitPull(40, 5)
-
- all := me.found.SortByFullPath()
- for all.Scan() {
- repo := all.Next()
- result := allerr[repo]
- if result.Error == gitpb.ErrorGitPullOnDirty {
- log.Info("skip git pull. repo is dirty", repo.GetGoPath())
- continue
- }
- if result.Error == gitpb.ErrorGitPullOnLocal {
- log.Info("skip git pull. local branch ", repo.GetGoPath())
- continue
- }
- if result.Exit == 0 {
- continue
- }
-
- log.Info("git pull error:", repo.GetGoPath(), result.Error)
- log.Info("git pull error:", repo.GetGoPath(), result.Stdout)
- }
-
-}
-*/
-
// git fetch origin master:master
func rillFetchMaster(repo *gitpb.Repo) error {
if repo.GetCurrentBranchName() != repo.GetUserBranchName() {