diff options
| -rw-r--r-- | doCheckout.go | 4 | ||||
| -rw-r--r-- | doClean.go | 4 | ||||
| -rw-r--r-- | main.go | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/doCheckout.go b/doCheckout.go index be3cffa..82d649e 100644 --- a/doCheckout.go +++ b/doCheckout.go @@ -102,6 +102,10 @@ func rillCheckoutUser(repo *gitpb.Repo) error { // never do dirty repos return nil } + if repo.GetCurrentBranchName() == repo.GetDevelBranchName() { + // repo is already on devel branch. have to move them there first for now + return rillCheckoutDevel(repo) + } if repo.GetCurrentBranchName() == repo.GetUserBranchName() { // repo is already on user branch return nil @@ -100,7 +100,7 @@ func checkhashes(repo *gitpb.Repo, hashes []string, refpath string) ([]string, e if !repo.Exists(refpath) { return hashes, nil } - r, err := repo.RunStrictNew([]string{"cat", refpath}) + r, err := repo.RunStrict([]string{"cat", refpath}) if err != nil { return hashes, err } @@ -535,7 +535,7 @@ func isBranchSubsetOfTrunk(repo *gitpb.Repo, branch string, trunk string) error // if zero, that means branch1 is entirely contained in branch2 and can be safely deleted func countGitDiffLog(repo *gitpb.Repo, branch1, branch2 string) int { cmd := repo.ConstructGitDiffLog(branch1, branch2) - r, err := repo.RunStrictNew(cmd) + r, err := repo.RunStrict(cmd) if err != nil { return -1 } @@ -31,7 +31,7 @@ var configSave bool func getVersion(repo *gitpb.Repo, name string) string { cmd := []string{"git", "describe", "--tags", "--always", name} - result := repo.RunQuiet(cmd) + result, _ := repo.RunQuiet(cmd) output := strings.Join(result.Stdout, "\n") log.Info("cmd =", cmd, output) |