summaryrefslogtreecommitdiff
path: root/merge.go
diff options
context:
space:
mode:
authorJeff Carr <[email protected]>2024-12-03 18:03:29 -0600
committerJeff Carr <[email protected]>2024-12-03 18:03:29 -0600
commit54cdb3fbec0fc6336917702326a56816436f2d21 (patch)
treec2264047560afa222c4f9debaeb10f7d4f4885de /merge.go
parent283bd90e91d22e107cff71fcc613b8d646784aba (diff)
Diffstat (limited to 'merge.go')
-rw-r--r--merge.go2
1 files changed, 0 insertions, 2 deletions
diff --git a/merge.go b/merge.go
index 2a37c08..d735d15 100644
--- a/merge.go
+++ b/merge.go
@@ -46,13 +46,11 @@ func (rs *RepoStatus) fetchBranchByName(bname string) (error, string) {
if rs.gitConfig == nil {
return errors.New("missing .git/config"), ""
}
- log.Log(REPO, rs.Name(), "looking for branch:", bname)
for name, branch := range rs.gitConfig.branches {
if name == bname {
// found the branch!
log.Log(REPO, " ", name, "remote:", branch.remote, "merge", branch.merge)
cmd := []string{"git", "fetch", branch.remote, bname + ":" + bname}
- log.Log(REPO, "running:", rs.Name(), cmd)
r := rs.Run(cmd)
output := strings.Join(r.Stdout, "\n")
return r.Error, strings.TrimSpace(output)