Don't fail for every checkout

isc-etamarch · isc-etamarch · commit aa661cea9931 · 2024-10-22T09:42:00.000-04:00
Should only fail when the error stream contains an error message
diff --git a/cls/SourceControl/Git/Utils.cls b/cls/SourceControl/Git/Utils.cls
@@ -414,7 +414,7 @@ ClassMethod SwitchBranch(targetBranchName As %String) As %Status
     do ..PrintStreams(errStream, outStream)
     // Checkout can fail due to unstaged changes
     set errs = errStream.Read()
-    if (errs '= "") {
+    if ($find(errs, "error")) {
         quit $$$ERROR($$$GeneralError, errs)
     }
     quit $$$OK

Original file line number	Diff line number	Diff line change
`@@ -414,7 +414,7 @@ ClassMethod SwitchBranch(targetBranchName As %String) As %Status`
`414`	`414`	`do ..PrintStreams(errStream, outStream)`
`415`	`415`	`// Checkout can fail due to unstaged changes`
`416`	`416`	`set errs = errStream.Read()`
`417`		`- if (errs '= "") {`
	`417`	`+ if ($find(errs, "error")) {`
`418`	`418`	`quit $$$ERROR($$$GeneralError, errs)`
`419`	`419`	`}`
`420`	`420`	`quit $$$OK`