Merge branch 'main' into fix-mappings-ui

Author: isc-tleavitt

CHANGELOG.md

@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 - Studio export path doesn't get weird mixed slahes on Windows (#252)
 - Fixed bug with adding mappings through the Settings page (#270)
+- Pulling add/delete of multiple non-IRIS files no longer causes error (#273)
 
 ## [2.2.0] - 2023-06-05
 

cls/SourceControl/Git/Utils.cls

@@ -409,11 +409,15 @@ ClassMethod Pull(remote As %String = "origin", preview As %Boolean = 0) As %Stat
     while(key '= "") {
         set modification = files(key)
         if (modification.changeType = "D"){
-            set deletedFiles = deletedFiles_","_modification.internalName
+            if (modification.internalName '= "") {
+                set deletedFiles = deletedFiles_","_modification.internalName
+            }
         } elseif (modification.changeType = "A"){
             set modification.internalName = ##class(SourceControl.Git.Utils).NameToInternalName(modification.externalName,,0)
-            set addedFiles = addedFiles_","_modification.internalName
-            set files(key) = modification
+            if (modification.internalName '= "") {
+                set addedFiles = addedFiles_","_modification.internalName
+                set files(key) = modification
+            }
         }
         set key = $order(files(key))
     }
@@ -1983,3 +1987,4 @@ ClassMethod BuildCEInstallationPackage(ByRef destination As %String) As %Status
 }
 
 }
+