Merge pull request #699 from intersystems/import-settings-first

Settings file imports before everything else

Author: isc-tleavitt

CHANGELOG.md

@@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fixed business processes and rules not being added to source control automatically (#676)
 - Embedded Git commits settings when cloning empty repo to avert any issues
 - Fixed Import All options not importing the Embedded Git configuration file
+- That configuration file now imports before everything else (#697)
 - Improved performance of IDE editing and baselining of decomposed productions
 - Fixed Discard / Stash not working on deletes (#688)
 - Fixed errors deploying decomposed production changes on Windows network drives (#696)

cls/SourceControl/Git/PullEventHandler/IncrementalLoad.cls

@@ -10,6 +10,15 @@ Parameter DESCRIPTION = "Performs an incremental load and compile of all changes
 Method OnPull() As %Status
 {
     set sc = $$$OK
+
+    // certain items must be imported before everything else.
+    for i=1:1:$get(..ModifiedFiles) {
+        set internalName = ..ModifiedFiles(i).internalName
+        if internalName = ##class(SourceControl.Git.Settings.Document).#INTERNALNAME {
+            set sc = $$$ADDSC(sc, ##class(SourceControl.Git.Utils).ImportItem(internalName))
+        }
+    }
+
     set nFiles = 0
 
     for i=1:1:$get(..ModifiedFiles){