Fixing terminate issue

Author: isc-etamarch

cls/SourceControl/Git/API.cls

@@ -44,10 +44,14 @@ ClassMethod Configure()
 }
 
 /// API for git pull - just wraps Utils
-/// - terminateOnError: if set to 1, this will return an error if there are any errors in the pull, otherwise will return $$$OK
-ClassMethod Pull(terminateOnError As %Boolean = 0)
+/// - pTerminateOnError: if set to 1, this will terminate on error if there are any errors in the pull, otherwise will return status
+ClassMethod Pull(pTerminateOnError As %Boolean = 0)
 {
-    quit ##class(SourceControl.Git.Utils).Pull(,terminateOnError)
+    set st = ##class(SourceControl.Git.Utils).Pull(,pTerminateOnError)
+    if pTerminateOnError && $$$ISERR(st) {
+        Do $System.Process.Terminate($Job,1)
+    }
+    quit st
 }
 
 /// Locks the environment to prevent changes to code other than through git pull.

cls/SourceControl/Git/Utils.cls

@@ -610,7 +610,7 @@ ClassMethod GetCurrentRevision() As %String
     quit revision
 }
 
-ClassMethod Pull(remote As %String = "origin", terminateOnError As %Boolean=0) As %Status
+ClassMethod Pull(remote As %String = "origin", pTerminateOnError As %Boolean=0) As %Status
 {
     New %gitSCOutputFlag
     Set %gitSCOutputFlag = 1
@@ -626,7 +626,7 @@ ClassMethod Pull(remote As %String = "origin", terminateOnError As %Boolean=0) A
     do errStream.OutputToDevice()
     write !, "Pull ran with return code: " _ returnCode
     set err = errStream.Read()
-    if $find(err,"error") && terminateOnError {
+    if ($find(err,"error") || $find(err, "fatal")) && pTerminateOnError {
         quit $$$ERROR($$$GeneralError, err)
     }
     quit $$$OK