johno/gastown
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/polecat/Immortan'

Browse Source 
# Conflicts:
#	internal/refinery/engineer.go
#	internal/refinery/engineer_test.go
This commit is contained in:
Steve Yegge
2025-12-19 18:27:51 -08:00
parent 4c05af3351 debe47cc62
commit 71918a1be4
6 changed files with 335 additions and 552 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
internal/git/git.go
View File

@@ -364,7 +364,7 @@ func (g *Git) RemoteBranchExists(remote, branch string) (bool, error) {
return out != "", nil
}
// DeleteBranch deletes a branch.
// DeleteBranch deletes a local branch.
func (g *Git) DeleteBranch(name string, force bool) error {
flag := "-d"
if force {
@@ -374,6 +374,12 @@ func (g *Git) DeleteBranch(name string, force bool) error {
return err
}
// DeleteRemoteBranch deletes a branch from the remote.
func (g *Git) DeleteRemoteBranch(remote, branch string) error {
_, err := g.run("push", remote, "--delete", branch)
return err
}
// Rev returns the commit hash for the given ref.
func (g *Git) Rev(ref string) (string, error) {
return g.run("rev-parse", ref)