Merge pull request #633 from intersystems/issue-632

Fix git issue

Author: isc-tleavitt

CHANGELOG.md

@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 - Fixed improper encoding of unicode characters in commit messages (#627)
 - Creating a new branch now reports the error if uncommitted changes conflict (#624)
+- Fix Configure erroring out if git isn't found (#632)
 
 ## [2.7.0] - 2024-11-04
 

cls/SourceControl/Git/API.cls

@@ -18,12 +18,6 @@ ClassMethod Configure()
         set gitExists = ##class(SourceControl.Git.Utils).GitBinExists(.version)
         set gitBinPath = ##class(SourceControl.Git.Utils).GitBinPath(.isDefault)
 
-        // Make sure they are using an appropriate git version
-        if (+$PIECE(version,"version ",2))<2.31 {
-            write !!, "WARNING: You are using an older version of git which is not compatible with git-source-control. Please upgrade to git version 2.31.0 or greater to continue"
-            write !!, "Cancelling git-source-control configuration..."
-            quit
-        }
         if gitExists && isDefault {
             // Note: version starts with "git version"
             write !,version," is available via PATH. You may enter a path to a different version if needed."

cls/SourceControl/Git/Settings.cls

@@ -184,6 +184,12 @@ ClassMethod Configure() As %Boolean [ CodeMode = objectgenerator ]
             do %code.WriteLine(" set status =  inst.ConfigureBinPath(.value)")
             do %code.WriteLine(" if (status) { set valid = 1 }")
             do %code.WriteLine(" }")
+            do %code.WriteLine(" set gitExists = ##class(SourceControl.Git.Utils).GitBinExists(.version)")
+            do %code.WriteLine(" if (+$PIECE(version,""version "",2))<2.31 && gitExists{")
+            do %code.WriteLine(" write !!, ""WARNING: You are using an older version of git which is not compatible with git-source-control. Please upgrade to git version 2.31.0 or greater to continue""")
+            do %code.WriteLine(" write !!, ""Cancelling git-source-control configuration...""")
+            do %code.WriteLine(" quit")
+            do %code.WriteLine(" }")
         } elseif ((propertyDef) && (propertyDef.Name = "basicMode")) {
             set basicModePromptFlag = defaultPromptFlag + $$$MatchExactArrayMask + $$$InitialDisplayMask
             do %code.WriteLine(" set list(1) = ""Yes""")

cls/SourceControl/Git/Utils.cls

@@ -49,7 +49,7 @@ ClassMethod TempFolder() As %String
 
 ClassMethod DefaultTempFolder() As %String
 {
-    quit $get(@..#Storage@("settings","namespaceTemp"),..DefaultTemp()_$translate($znspace,"%")_..#Slash)
+    quit $get(@..#Storage@("settings","namespaceTemp"),..DefaultTemp()_..#Slash_$translate($znspace,"%")_..#Slash)
 }
 
 ClassMethod MappingsNode() As %String [ CodeMode = expression ]
@@ -2944,4 +2944,3 @@ ClassMethod InDefaultBranchBasicMode() As %Boolean
 }
 
 }
-