Skip to content

Commit 7ec5599

Browse files
committed
Disable committing item from menu when in default merge branch and basic mode
1 parent 4c46e10 commit 7ec5599

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

cls/SourceControl/Git/Extension.cls

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,8 @@ Method OnSourceMenuContextItem(itemName As %String, menuItemName As %String, ByR
220220
} elseif menuItemName = "Commit" {
221221
set Enabled = 1
222222
do ..GetStatus(.itemName, .isInSourceControl, .isEditable,.isCheckedOut,.userCheckedOut)
223-
if '(##class(SourceControl.Git.Change).IsUncommitted(##class(SourceControl.Git.Utils).FullExternalName(itemName))) || ($username '= userCheckedOut) {
223+
set defaultBasic = ##class(SourceControl.Git.Utils).InDefaultBranchBasicMode()
224+
if '(##class(SourceControl.Git.Change).IsUncommitted(##class(SourceControl.Git.Utils).FullExternalName(itemName))) || ($username '= userCheckedOut) || (defaultBasic) {
224225
set Enabled = 0
225226
}
226227
} elseif ##class(SourceControl.Git.Utils).IsInSourceControl(itemName) {

0 commit comments

Comments
 (0)