summaryrefslogtreecommitdiff
path: root/git.go
diff options
context:
space:
mode:
authorJeff Carr <[email protected]>2024-01-30 13:31:46 -0600
committerJeff Carr <[email protected]>2024-01-30 13:31:46 -0600
commit78049e664d7955df52d64aca3adc74b7539d1fa6 (patch)
treeb6afe5cad528b8ebfbb65322b3c6a0b652bde8bb /git.go
parent940096ff405fe38207443e8894f900e3860b7bca (diff)
merge automation
Signed-off-by: Jeff Carr <[email protected]>
Diffstat (limited to 'git.go')
-rw-r--r--git.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/git.go b/git.go
index bbf7030..722a00c 100644
--- a/git.go
+++ b/git.go
@@ -279,8 +279,8 @@ func (rs *RepoStatus) GetStatus() string {
if rs.userBranchVersion.String() != rs.develBranchVersion.String() {
return "merge to devel"
}
- if rs.userBranchVersion.String() != rs.masterBranchVersion.String() {
- return "ready to release"
+ if rs.develBranchVersion.String() != rs.masterBranchVersion.String() {
+ return "merge to main"
}
if rs.lasttag.String() != rs.masterBranchVersion.String() {
return "ready to tag version"