Import embedded-git-config.json first when performing an Import All#807
Merged
isc-pbarton merged 3 commits intointersystems:mainfrom Jul 28, 2025
Merged
Conversation
cambot
reviewed
Jul 18, 2025
cls/SourceControl/Git/Utils.cls
Outdated
| quit:internalName="" | ||
|
|
||
| // If a config file is found then import it | ||
| if internalName = ##class(SourceControl.Git.Settings.Document).#INTERNALNAME { |
Contributor
There was a problem hiding this comment.
For what it's worth, I think your for loop (lines 1572-1578) could be simplified to a single if statement:
if $Data(itemList(##class(SourceControl.Git.Settings.Document).#INTERNALNAME))
For me, the embedded-git-config.GSC index was at the very end of my list of files.
Contributor
Author
There was a problem hiding this comment.
Thank you. I agree and have updated the branch to do this. I have added you as a co-author.
Co-authored-by: Cameron M <[email protected]>
isc-pbarton
approved these changes
Jul 28, 2025
Collaborator
isc-pbarton
left a comment
isc-pbarton
left a comment
There was a problem hiding this comment.
Nice work, thank you both! Apologies for the delay on this and other reviews.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #806
The config file
embedded-git-config.jsonis now imported first when performing an Import All.This combined with some other recently merged PRs (#792, #799, #800) allows for an existing Git repository that contains a config file to be imported with the only initial configuration required being the repository location:
^SYS("SourceControl","Git","settings","namespaceTemp")(if your Git path and other defaults are acceptable at least)