Skip to content

Commit 88fb29b

Browse files
authored
Merge pull request #758 from intersystems/fix-delete-ownership
Deletes are no longer removed from the uncommitted queue
2 parents 2b3b806 + 9a94a86 commit 88fb29b

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1111
- Expanded Baseline Export to include custom HL7, X12, ASTM schemas and Lookup Tables (#693)
1212

1313
### Fixed
14+
- Deletes are now properly owned by the user who did the delete (#729)
1415
- Pull page output now displays better when pull preview shows a lot of changes (#740)
1516

1617
## [2.11.0] - 2025-04-23

cls/SourceControl/Git/Change.cls

+4-2
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,10 @@ ClassMethod RefreshUncommitted(Display = 0, IncludeRevert = 0, Output gitFiles,
149149
// skip files belonging to other git enabled packages
150150
if ($EXTRACT(filename, 1, $LENGTH(packageRoot)) '= packageRoot) continue
151151

152-
if (('##class(%File).Exists(filename)) || (InternalName = "") || ((InternalName '= "") && ('$data(gitFiles(InternalName), found)) &&
153-
(($data($$$TrackedItems(InternalName))) || ##class(SourceControl.Git.Utils).NormalizeExtension($data($$$TrackedItems(InternalName)))))) {
152+
if ((InternalName = "")
153+
|| ((InternalName '= "")
154+
&& ('$data(gitFiles(InternalName), found))
155+
&& ($data($$$TrackedItems(##class(%Studio.SourceControl.Interface).normalizeName(InternalName)))))) {
154156
set sc=..RemoveUncommitted(filename,Display,0,0)
155157
if $$$ISERR(sc) continue
156158
}

0 commit comments

Comments
 (0)