Merge pull request #849 from raymond-rebbeck/main

Fix pull failure when deleted items have no internal or external name

Author: isc-pbarton

CHANGELOG.md

@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 - Fixed Import All deploying changes to files in a CSP application (#828)
+- Fixed pull failure when deleted items have no internal or external name (#848)
 
 ## [2.13.0] - 2025-08-20
 

cls/SourceControl/Git/PullEventHandler/IncrementalLoad.cls

@@ -117,7 +117,7 @@ Method DeleteFile(item As %String = "", externalName As %String = "") As %Status
         $$$ThrowOnError(sc)
     } catch e {
         set filename = ##class(SourceControl.Git.Utils).FullExternalName(item)
-        if '##class(%File).Exists(filename) {
+        if (filename = "") || '##class(%File).Exists(filename) {
             do ##class(SourceControl.Git.Utils).RemoveRoutineTSH(item)
             // file doesn't exist anymore despite error -- should be ok
             set sc = $$$OK

cls/SourceControl/Git/Utils.cls

@@ -1337,8 +1337,14 @@ ClassMethod UpdateRoutineTSH(InternalName As %String, tsh As %String) As %Status
 
 ClassMethod RemoveRoutineTSH(InternalName As %String) As %Status
 {
-    kill @..#Storage@("TSH", ##class(%Studio.SourceControl.Interface).normalizeName(InternalName))
-    quit $$$OK
+    Quit:(InternalName = "") $$$OK
+    Set tInternalName = ##class(%Studio.SourceControl.Interface).normalizeName(InternalName)
+
+    // Prevent a possible null subscript error
+    Quit:(tInternalName = "") $$$OK
+    Kill @..#Storage@("TSH", tInternalName)
+
+    Quit $$$OK
 }
 
 ClassMethod DeleteExternalFile(InternalName As %String) As %Status