Merge branch 'main' into fix-609

isc-tleavitt · web-flow · commit 8fae8784de41 · 2024-10-31T16:10:55.000-04:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -53,6 +53,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fix wording for Git Repo Root Directory (#601)
 - Fix Diff View options not applying immediately (#590)
 - Cleaned up parsing of command output in Git Web UI (#609)
+- Fix TempFolder misspecification (#611)
 
 ## [2.6.0] - 2024-10-07
 
diff --git a/cls/SourceControl/Git/Utils.cls b/cls/SourceControl/Git/Utils.cls
@@ -24,7 +24,7 @@ $Replace(..#Storage,"^SYS","^%SYS")
 /// Returns root temp folder
 ClassMethod DefaultTemp() As %String
 {
-    set defaultTemp = ##class(%File).Construct($System.Util.ManagerDirectory(),"repo/"_$Namespace)
+    set defaultTemp = ##class(%File).Construct($System.Util.ManagerDirectory(),"repo/")
     try {
         set defaultTemp = $Get(@..%SYSNamespaceStorage()@("%defaultTemp"), defaultTemp)
     } catch e {

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ $Replace(..#Storage,"^SYS","^%SYS")`
`24`	`24`	`/// Returns root temp folder`
`25`	`25`	`ClassMethod DefaultTemp() As %String`
`26`	`26`	`{`
`27`		`- set defaultTemp = ##class(%File).Construct($System.Util.ManagerDirectory(),"repo/"_$Namespace)`
	`27`	`+ set defaultTemp = ##class(%File).Construct($System.Util.ManagerDirectory(),"repo/")`
`28`	`28`	`try {`
`29`	`29`	`set defaultTemp = $Get(@..%SYSNamespaceStorage()@("%defaultTemp"), defaultTemp)`
`30`	`30`	`} catch e {`