Skip to content

Commit fa3df51

Browse files
committed
fix: settings file imports before all else
1 parent d2fba37 commit fa3df51

File tree

2 files changed

+11
-0
lines changed

2 files changed

+11
-0
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1616
- Fixed business processes and rules not being added to source control automatically (#676)
1717
- Embedded Git commits settings when cloning empty repo to avert any issues
1818
- Fixed Import All options not importing the Embedded Git configuration file
19+
- That configuration file now imports before everything else (#697)
1920
- Improved performance of IDE editing and baselining of decomposed productions
2021
- Fixed Discard / Stash not working on deletes (#688)
2122

cls/SourceControl/Git/PullEventHandler/IncrementalLoad.cls

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,16 @@ Parameter DESCRIPTION = "Performs an incremental load and compile of all changes
1010
Method OnPull() As %Status
1111
{
1212
set sc = $$$OK
13+
14+
// certain items must be imported before everything else.
15+
for i=1:1:$get(..ModifiedFiles) {
16+
set internalName = ..ModifiedFiles(i).internalName
17+
if internalName = ##class(SourceControl.Git.Settings.Document).#INTERNALNAME {
18+
set sc = $$$ADDSC(sc, ##class(SourceControl.Git.Utils).ImportItem(internalName))
19+
}
20+
}
21+
break
22+
1323
set nFiles = 0
1424

1525
for i=1:1:$get(..ModifiedFiles){

0 commit comments

Comments
 (0)