Skip to content

Commit 67285f5

Browse files
Prevent pull failure when deleting file where filename or item are empty strings
1 parent 093ec2e commit 67285f5

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

cls/SourceControl/Git/PullEventHandler/IncrementalLoad.cls

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,10 @@ Method DeleteFile(item As %String = "", externalName As %String = "") As %Status
117117
$$$ThrowOnError(sc)
118118
} catch e {
119119
set filename = ##class(SourceControl.Git.Utils).FullExternalName(item)
120-
if '##class(%File).Exists(filename) {
121-
do ##class(SourceControl.Git.Utils).RemoveRoutineTSH(item)
120+
if (filename = "") || '##class(%File).Exists(filename) {
121+
if (item '= "") {
122+
do ##class(SourceControl.Git.Utils).RemoveRoutineTSH(item)
123+
}
122124
// file doesn't exist anymore despite error -- should be ok
123125
set sc = $$$OK
124126
} else {

0 commit comments

Comments
 (0)