From 6f43c6b2f8e8ef4b19efa43f35f8be8ed7f77fd0 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Sun, 5 Oct 2025 13:05:49 -0500 Subject: this stuff finally is fixed (maybe) --- branches.go | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'branches.go') 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) -- cgit v1.2.3