diff options
Diffstat (limited to 'doExamine.go')
| -rw-r--r-- | doExamine.go | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/doExamine.go b/doExamine.go index b4f99c4..45d0705 100644 --- a/doExamine.go +++ b/doExamine.go @@ -96,7 +96,7 @@ func examineBranch(repo *gitpb.Repo) error { } else { repo.RunVerbose([]string{"ls", "-l", ".git/refs/remotes/origin"}) log.Info("why is this non-local branch a problem?", repo.CurrentTag.Refname) - r, err := repo.RunVerbose([]string{"cat", filepath.Join(".git/refs/remotes/origin", base)}) + r, err := repo.RunStrict([]string{"cat", filepath.Join(".git/refs/remotes/origin", base)}) if err == nil { cmd := []string{"git", "show", "-s", "--format=\"%H %ae %as %s\"", r.Stdout[0]} repo.RunVerbose(cmd) @@ -137,7 +137,7 @@ func examineBranch(repo *gitpb.Repo) error { if argv.Clean.Examine.Fix == nil { log.Info(repo.GetGoPath(), cmd) } else { - if _, err := repo.RunVerbose(cmd); err != nil { + if err := repo.RunVerbose(cmd); err != nil { return err } } @@ -145,7 +145,7 @@ func examineBranch(repo *gitpb.Repo) error { if argv.Clean.Examine.Fix == nil { log.Info(repo.GetGoPath(), cmd) } else { - if _, err := repo.RunVerbose(cmd); err != nil { + if err := repo.RunVerbose(cmd); err != nil { return err } } @@ -156,7 +156,7 @@ func examineBranch(repo *gitpb.Repo) error { repo.RunVerbose([]string{"ls", "-l", ".git/refs/remotes/origin"}) } else { log.Info(repo.GetGoPath(), "TODO: CHECK REMOTE BRANCH DOES NOT EXIST", repo.CurrentTag.Refname) - if _, err := repo.RunVerbose(cmd); err != nil { + if err := repo.RunVerbose(cmd); err != nil { return err } else { return nil @@ -207,7 +207,7 @@ func showNotMaster(repo *gitpb.Repo) ([]string, error) { cmd = append(cmd, repo.CurrentTag.Hash) cmd = append(cmd, "--not") cmd = append(cmd, repo.GetMasterBranchName()) - r, err := repo.RunVerboseOnError(cmd) + r, err := repo.RunStrict(cmd) return r.Stdout, err } @@ -219,14 +219,14 @@ func showNotDevel(repo *gitpb.Repo) ([]string, error) { cmd = append(cmd, repo.CurrentTag.Hash) cmd = append(cmd, "--not") cmd = append(cmd, "devel") - r, err := repo.RunVerboseOnError(cmd) + r, err := repo.RunStrict(cmd) return r.Stdout, err } // count all objects only in branch1 func countDiffObjects(repo *gitpb.Repo, branch1, branch2 string) int { cmd := repo.ConstructGitDiffLog(branch1, branch2) - r, err := repo.RunVerboseOnError(cmd) + r, err := repo.RunStrict(cmd) if err != nil { return -1 } @@ -252,7 +252,7 @@ func gitPushStrict(repo *gitpb.Repo, branchName string) error { var cmd []string cmd = append(cmd, "git") cmd = append(cmd, "push") - _, err := repo.RunVerbose(cmd) + err := repo.RunVerbose(cmd) if err != nil { cmd = []string{"git", "whatchanged", repo.CurrentTag.Hash, "-1"} repo.RunVerbose(cmd) |