Skip to content

Commit 71201c2

Browse files
committed
if we pull an add/delete to a file with no internal name, do not add/delete it from server-side source control.
1 parent d32163b commit 71201c2

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

cls/SourceControl/Git/Utils.cls

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -409,11 +409,15 @@ ClassMethod Pull(remote As %String = "origin", preview As %Boolean = 0) As %Stat
409409
while(key '= "") {
410410
set modification = files(key)
411411
if (modification.changeType = "D"){
412-
set deletedFiles = deletedFiles_","_modification.internalName
412+
if (modification.internalName '= "") {
413+
set deletedFiles = deletedFiles_","_modification.internalName
414+
}
413415
} elseif (modification.changeType = "A"){
414416
set modification.internalName = ##class(SourceControl.Git.Utils).NameToInternalName(modification.externalName,,0)
415-
set addedFiles = addedFiles_","_modification.internalName
416-
set files(key) = modification
417+
if (modification.internalName '= "") {
418+
set addedFiles = addedFiles_","_modification.internalName
419+
set files(key) = modification
420+
}
417421
}
418422
set key = $order(files(key))
419423
}
@@ -1983,3 +1987,4 @@ ClassMethod BuildCEInstallationPackage(ByRef destination As %String) As %Status
19831987
}
19841988

19851989
}
1990+

0 commit comments

Comments
 (0)