Skip to content

Commit 6be8a7b

Browse files
Do not remove deletes from the uncommitted queue when checking item status
1 parent 0c9c250 commit 6be8a7b

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

cls/SourceControl/Git/Extension.cls

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Import SourceControl.Git
1+
Include SourceControl.Git
22

33
/// Main source control extension class, configured namespace-wide to enable use via VSCode and Studio
44
Class SourceControl.Git.Extension Extends %Studio.SourceControl.Base
@@ -529,7 +529,8 @@ Method GetStatus(ByRef InternalName As %String, ByRef IsInSourceControl As %Bool
529529
} else {
530530
// If it doesn't show up in git status, there are no uncommitted changes so it should not be locked or checked out by any user
531531
set Editable=1, IsCheckedOut=0, UserCheckedOut=""
532-
if ##class(SourceControl.Git.Change).IsUncommitted(filename){
532+
if ##class(SourceControl.Git.Change).IsUncommitted(filename)
533+
&& '('$data(files(InternalName)) && $data($$$TrackedItems(##class(%Studio.SourceControl.Interface).normalizeName(InternalName)))) {
533534
#; Remove the item from the list of uncommitted changes;
534535
set sc=##class(SourceControl.Git.Change).RemoveUncommitted(filename,1,1)
535536
if $$$ISERR(sc) write "Error removing uncommitted file "_filename_" - "_$system.OBJ.DisplayError(sc)

0 commit comments

Comments
 (0)