diff options
Diffstat (limited to 'branches.go')
| -rw-r--r-- | branches.go | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/branches.go b/branches.go index 7b256bb..b656522 100644 --- a/branches.go +++ b/branches.go @@ -107,17 +107,15 @@ func (repo *Repo) MakeLocalDevelBranch() (*cmd.Status, error) { branch = "devel" } - if repo.Exists(filepath.Join(".git/refs/heads", branch)) { - // local devel branch already exists + if repo.IsLocalBranch(branch) { return nil, nil } - - if repo.Exists(filepath.Join(".git/refs/remotes/origin", branch)) { - // remote devel branch exists, but local does not + if repo.IsRemoteBranch(branch) { cmd := []string{"git", "checkout", branch} return repo.RunVerboseOnError(cmd) } + // no local or remote devel branch. make the branch from 'master' master := repo.GetMasterBranchName() cmd := []string{"git", "branch", branch, master} repo.RunVerboseOnError(cmd) |