fixed issue with not killing bad global

isc-hwojnick · isc-hwojnick · commit 5b5076b70ed2 · 2024-08-15T15:58:38.000-04:00
diff --git a/cls/SourceControl/Git/Utils.cls b/cls/SourceControl/Git/Utils.cls
@@ -185,8 +185,9 @@ $Find(..#ImportAfterGitMenuItems, ","_menuItemName_",") > 0
 
 ClassMethod MigrateInstanceSettings()
 {
-    if '$data(@..%SYSNamespaceStorage()@("%gitBinPath")) {
+    if '$data(^["%SYS"]SYS("SourceControl", "Git")) {
         merge ^%SYS("SourceControl", "Git") = ^["%SYS"]SYS("SourceControl", "Git")
+        kill ^["%SYS"]SYS("SourceControl", "Git")
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -185,8 +185,9 @@ $Find(..#ImportAfterGitMenuItems, ","_menuItemName_",") > 0`
`185`	`185`
`186`	`186`	`ClassMethod MigrateInstanceSettings()`
`187`	`187`	`{`
`188`		`- if '$data(@..%SYSNamespaceStorage()@("%gitBinPath")) {`
	`188`	`+ if '$data(^["%SYS"]SYS("SourceControl", "Git")) {`
`189`	`189`	`merge ^%SYS("SourceControl", "Git") = ^["%SYS"]SYS("SourceControl", "Git")`
	`190`	`+ kill ^["%SYS"]SYS("SourceControl", "Git")`
`190`	`191`	`}`
`191`	`192`	`}`
`192`	`193`