From 3d260a0219841f4835d6a0d0e370bde483f35d08 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Fri, 29 Nov 2024 21:51:30 -0600 Subject: updates for autogenpb --- gitTag.query.go | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'gitTag.query.go') diff --git a/gitTag.query.go b/gitTag.query.go index 8c288e4..ef87561 100644 --- a/gitTag.query.go +++ b/gitTag.query.go @@ -35,7 +35,8 @@ func (repo *Repo) GetLastTag() string { } func (repo *Repo) GitMasterVersion() string { - v, err := repo.gitVersionByName("master") + bname := repo.GetMasterBranchName() + v, err := repo.gitVersionByName(bname) /* count := repo.LenGitTags() log.Info(repo.GoPath, "tag count", count) @@ -53,7 +54,8 @@ func (repo *Repo) GitMasterVersion() string { } func (repo *Repo) GitDevelVersion() string { - v, err := repo.gitVersionByName("devel") + bname := repo.GetDevelBranchName() + v, err := repo.gitVersionByName(bname) if err == nil { return v } else { @@ -63,7 +65,8 @@ func (repo *Repo) GitDevelVersion() string { } func (repo *Repo) GitUserVersion() string { - v, err := repo.gitVersionByName("jcarr") + bname := repo.GetUserBranchName() + v, err := repo.gitVersionByName(bname) if err == nil { return v } else { @@ -129,6 +132,6 @@ func (repo *Repo) IsBranch(findname string) bool { return true } } - log.Log(GITPBWARN, "did not find tag:", findname, "in", repo.GoPath) + log.Log(GITPB, "did not find tag:", findname, "in", repo.GoPath) return false } -- cgit v1.2.3