summaryrefslogtreecommitdiff
path: root/merge.go
diff options
context:
space:
mode:
authorJeff Carr <[email protected]>2024-02-24 04:50:31 -0600
committerJeff Carr <[email protected]>2024-02-24 04:50:31 -0600
commitddd95e9afc926d9e0a4a372dbf433d81c3db3207 (patch)
tree2b0e6788c5a877c528d4287be2de90de51795c9b /merge.go
parent2a62d23482aefc506b9cbb4114edb4c368830194 (diff)
GitPull() detects local only branches
Diffstat (limited to 'merge.go')
-rw-r--r--merge.go8
1 files changed, 8 insertions, 0 deletions
diff --git a/merge.go b/merge.go
index bd51d10..559c5af 100644
--- a/merge.go
+++ b/merge.go
@@ -8,6 +8,14 @@ import (
"go.wit.com/widget"
)
+// used to block commits on non-user branches
+func (rs *RepoStatus) IsUserBranch() bool {
+ if rs.GetCurrentBranchName() == rs.GetUserBranchName() {
+ return true
+ }
+ return false
+}
+
func (rs *RepoStatus) MergeUserToDevel() bool {
startbranch := rs.GetCurrentBranchName()
devel := rs.GetDevelBranchName()