jcarr
/
repostatus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

quiet git pull

This commit is contained in:
Jeff Carr 2024-02-29 19:16:45 -06:00
parent fc849f6003
commit 035b4eb443
2 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
git.go
View File

@ -40,23 +40,13 @@ func (rs *RepoStatus) Age() time.Duration {
return time.Since(tagTime) return time.Since(tagTime)
} }
func (rs *RepoStatus) GitPull() error { var ErrorMissingGitConfig error = errors.New("missing .git/config")
var ErrorGitPullOnLocal error = errors.New("git pull on local only branch")
func (rs *RepoStatus) GitPull() (string, error) {
currentName := rs.GetCurrentBranchName() currentName := rs.GetCurrentBranchName()
if rs.IsOnlyLocalTag(currentName) { if rs.IsOnlyLocalTag(currentName) {
log.Log(REPOWARN, rs.Path(), "can not git pull on local only branch", currentName) return "", ErrorGitPullOnLocal
return nil
}
var found bool = false
// okay, it's not local. Is it mapped in .git/config ?
for name, branch := range rs.gitConfig.branches {
log.Log(WARN, name, "remote:", branch.remote, "merge", branch.merge)
if name == currentName {
log.Log(WARN, "Found:", name, "remote:", branch.remote, "merge", branch.merge)
found = true
}
}
if !found {
return errors.New("git config error")
} }
var cmd []string var cmd []string
cmd = append(cmd, "git", "pull") cmd = append(cmd, "git", "pull")
@ -70,7 +60,7 @@ func (rs *RepoStatus) GitPull() error {
} else { } else {
log.Log(REPOWARN, "git pull error", rs.Path(), err) log.Log(REPOWARN, "git pull error", rs.Path(), err)
} }
return err return output, err
} }
/* /*

6
merge.go
View File

@ -46,13 +46,13 @@ func (rs *RepoStatus) fetchBranch(apple string) (error, string) {
if rs.gitConfig == nil { if rs.gitConfig == nil {
return errors.New("missing .git/config"), "" return errors.New("missing .git/config"), ""
} }
log.Log(REPOWARN, rs.Name(), "looking for branch:", apple) log.Log(REPO, rs.Name(), "looking for branch:", apple)
for name, branch := range rs.gitConfig.branches { for name, branch := range rs.gitConfig.branches {
if name == apple { if name == apple {
// found the branch! // found the branch!
log.Log(REPOWARN, " ", name, "remote:", branch.remote, "merge", branch.merge) log.Log(REPO, " ", name, "remote:", branch.remote, "merge", branch.merge)
cmd := []string{"git", "fetch", branch.remote, apple + ":" + apple} cmd := []string{"git", "fetch", branch.remote, apple + ":" + apple}
log.Log(REPOWARN, "running:", rs.Name(), cmd) log.Log(REPO, "running:", rs.Name(), cmd)
err, out := rs.RunCmd(cmd) err, out := rs.RunCmd(cmd)
return err, out return err, out
} }